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 | d4682361fd4d284657e4e33ca5f022cc8ea8f468 (patch) | |
| tree | 2678d43a774482267dc1347405ec85fe427b4543 /voice_engine/output_mixer.cc | |
| parent | 1bb2146351979b6610107419b2a9c86cca2692a3 (diff) | |
| download | webrtc-d4682361fd4d284657e4e33ca5f022cc8ea8f468.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/webrtc@3395 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/output_mixer.cc')
| -rw-r--r-- | voice_engine/output_mixer.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/voice_engine/output_mixer.cc b/voice_engine/output_mixer.cc index daf0d4a3..36a9da73 100644 --- a/voice_engine/output_mixer.cc +++ b/voice_engine/output_mixer.cc @@ -32,7 +32,7 @@ OutputMixer::NewMixedAudio(const WebRtc_Word32 id, WEBRTC_TRACE(kTraceStream, kTraceVoice, VoEId(_instanceId,-1), "OutputMixer::NewMixedAudio(id=%d, size=%u)", id, size); - _audioFrame = generalAudioFrame; + _audioFrame.CopyFrom(generalAudioFrame); _audioFrame.id_ = id; } @@ -135,7 +135,7 @@ OutputMixer::OutputMixer(const WebRtc_UWord32 instanceId) : { WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId,-1), "OutputMixer::OutputMixer() - ctor"); - + if ((_mixerModule.RegisterMixedStreamCallback(*this) == -1) || (_mixerModule.RegisterMixerStatusCallback(*this, 100) == -1)) { @@ -143,7 +143,7 @@ OutputMixer::OutputMixer(const WebRtc_UWord32 instanceId) : "OutputMixer::OutputMixer() failed to register mixer" "callbacks"); } - + _dtmfGenerator.Init(); } @@ -156,7 +156,7 @@ OutputMixer::Destroy(OutputMixer*& mixer) mixer = NULL; } } - + OutputMixer::~OutputMixer() { WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId,-1), @@ -191,7 +191,7 @@ OutputMixer::SetEngineInformation(voe::Statistics& engineStatistics) return 0; } -WebRtc_Word32 +WebRtc_Word32 OutputMixer::SetAudioProcessingModule( AudioProcessing* audioProcessingModule) { @@ -368,7 +368,7 @@ int OutputMixer::StartRecordingPlayout(const char* fileName, } CriticalSectionScoped cs(&_fileCritSect); - + // Destroy the old instance if (_outputFileRecorderPtr) { |