| Index: webrtc/voice_engine/transmit_mixer.cc
|
| diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc
|
| index eb5866c9339fe3489aa96c0b6c6c61f90e2d6153..663c02f44e2aac8b007294b1702f973c60456717 100644
|
| --- a/webrtc/voice_engine/transmit_mixer.cc
|
| +++ b/webrtc/voice_engine/transmit_mixer.cc
|
| @@ -289,9 +289,6 @@ TransmitMixer::PrepareDemux(const void* audioSamples,
|
| TypingDetection(keyPressed);
|
| #endif
|
|
|
| - // --- Mute signal
|
| - AudioFrameOperations::Mute(&_audioFrame, _mute, _mute);
|
| -
|
| // --- Mix with file (does not affect the mixing frequency)
|
| if (_filePlaying)
|
| {
|
| @@ -894,21 +891,6 @@ TransmitMixer::SetMixWithMicStatus(bool mix)
|
| _mixFileWithMicrophone = mix;
|
| }
|
|
|
| -int
|
| -TransmitMixer::SetMute(bool enable)
|
| -{
|
| - WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, -1),
|
| - "TransmitMixer::SetMute(enable=%d)", enable);
|
| - _mute = enable;
|
| - return 0;
|
| -}
|
| -
|
| -bool
|
| -TransmitMixer::Mute() const
|
| -{
|
| - return _mute;
|
| -}
|
| -
|
| int8_t TransmitMixer::AudioLevel() const
|
| {
|
| // Speech + file level [0,9]
|
|
|