| Index: talk/session/media/channel.cc
|
| diff --git a/talk/session/media/channel.cc b/talk/session/media/channel.cc
|
| index f65579f98b221b2caac5e0feea8a0d3a395bc0f0..428829192ffb02679ab114a8020caa0ec1eeedc1 100644
|
| --- a/talk/session/media/channel.cc
|
| +++ b/talk/session/media/channel.cc
|
| @@ -31,7 +31,6 @@
|
| #include "talk/media/base/rtputils.h"
|
| #include "webrtc/p2p/base/transportchannel.h"
|
| #include "talk/session/media/channelmanager.h"
|
| -#include "talk/session/media/typingmonitor.h"
|
| #include "webrtc/base/bind.h"
|
| #include "webrtc/base/buffer.h"
|
| #include "webrtc/base/byteorder.h"
|
| @@ -1384,26 +1383,6 @@ bool VoiceChannel::IsAudioMonitorRunning() const {
|
| return (audio_monitor_.get() != NULL);
|
| }
|
|
|
| -void VoiceChannel::StartTypingMonitor(const TypingMonitorOptions& settings) {
|
| - typing_monitor_.reset(new TypingMonitor(this, worker_thread(), settings));
|
| - SignalAutoMuted.repeat(typing_monitor_->SignalMuted);
|
| -}
|
| -
|
| -void VoiceChannel::StopTypingMonitor() {
|
| - typing_monitor_.reset();
|
| -}
|
| -
|
| -bool VoiceChannel::IsTypingMonitorRunning() const {
|
| - return typing_monitor_;
|
| -}
|
| -
|
| -bool VoiceChannel::MuteStream_w(uint32 ssrc, bool mute) {
|
| - bool ret = BaseChannel::MuteStream_w(ssrc, mute);
|
| - if (typing_monitor_ && mute)
|
| - typing_monitor_->OnChannelMuted();
|
| - return ret;
|
| -}
|
| -
|
| int VoiceChannel::GetInputLevel_w() {
|
| return media_engine_->GetInputLevel();
|
| }
|
|
|