diff options
| author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-22 04:44:30 +0000 |
|---|---|---|
| committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-01-22 04:44:30 +0000 |
| commit | ae1a58bba4f926d149a5f39243269c3f6625f494 (patch) | |
| tree | e1c3002386bd3d7127ca7fe5eeb3e114d7997048 /webrtc/modules/audio_conference_mixer | |
| parent | 899699e6f3eb4c26c211b864115065d34332d69c (diff) | |
| download | webrtc-ae1a58bba4f926d149a5f39243269c3f6625f494.tar.gz | |
Replace AudioFrame's operator= with CopyFrom().
Enforce DISALLOW_COPY_AND_ASSIGN to catch offenders.
Review URL: https://webrtc-codereview.appspot.com/1031007
git-svn-id: http://webrtc.googlecode.com/svn/trunk@3395 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'webrtc/modules/audio_conference_mixer')
| -rw-r--r-- | webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc index fb5203746f..3fedc487ac 100644 --- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc +++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc @@ -173,7 +173,7 @@ bool AudioConferenceMixerImpl::Init() if (!SetNumLimiterChannels(1)) return false; - if(_limiter->gain_control()->set_mode(GainControl::kFixedDigital) != + if(_limiter->gain_control()->set_mode(GainControl::kFixedDigital) != _limiter->kNoError) return false; @@ -1125,7 +1125,7 @@ WebRtc_Word32 AudioConferenceMixerImpl::MixFromList( { // No mixing required here; skip the saturation protection. AudioFrame* audioFrame = static_cast<AudioFrame*>(item->GetItem()); - mixedAudio = *audioFrame; + mixedAudio.CopyFrom(*audioFrame); SetParticipantStatistics(&_scratchMixedParticipants[position], *audioFrame); return 0; @@ -1173,7 +1173,7 @@ WebRtc_Word32 AudioConferenceMixerImpl::MixAnonomouslyFromList( { // No mixing required here; skip the saturation protection. AudioFrame* audioFrame = static_cast<AudioFrame*>(item->GetItem()); - mixedAudio = *audioFrame; + mixedAudio.CopyFrom(*audioFrame); return 0; } |