From ae1a58bba4f926d149a5f39243269c3f6625f494 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Tue, 22 Jan 2013 04:44:30 +0000 Subject: 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 --- .../audio_conference_mixer/source/audio_conference_mixer_impl.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'webrtc/modules/audio_conference_mixer') 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(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(item->GetItem()); - mixedAudio = *audioFrame; + mixedAudio.CopyFrom(*audioFrame); return 0; } -- cgit v1.2.3