| Index: webrtc/voice_engine/output_mixer.cc
|
| diff --git a/webrtc/voice_engine/output_mixer.cc b/webrtc/voice_engine/output_mixer.cc
|
| index 3bffc35494e649d95a0bc13107c509a0e1542260..2dc8bf2b260a87a3472634e95af71f2f0783f333 100644
|
| --- a/webrtc/voice_engine/output_mixer.cc
|
| +++ b/webrtc/voice_engine/output_mixer.cc
|
| @@ -108,7 +108,7 @@ OutputMixer::OutputMixer(uint32_t instanceId) :
|
| WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_instanceId,-1),
|
| "OutputMixer::OutputMixer() - ctor");
|
|
|
| - if (_mixerModule.RegisterMixedStreamCallback(*this) == -1)
|
| + if (_mixerModule.RegisterMixedStreamCallback(this) == -1)
|
| {
|
| WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId,-1),
|
| "OutputMixer::OutputMixer() failed to register mixer"
|
| @@ -215,14 +215,14 @@ int32_t
|
| OutputMixer::SetMixabilityStatus(MixerParticipant& participant,
|
| bool mixable)
|
| {
|
| - return _mixerModule.SetMixabilityStatus(participant, mixable);
|
| + return _mixerModule.SetMixabilityStatus(&participant, mixable);
|
| }
|
|
|
| int32_t
|
| OutputMixer::SetAnonymousMixabilityStatus(MixerParticipant& participant,
|
| bool mixable)
|
| {
|
| - return _mixerModule.SetAnonymousMixabilityStatus(participant,mixable);
|
| + return _mixerModule.SetAnonymousMixabilityStatus(&participant, mixable);
|
| }
|
|
|
| int32_t
|
|
|