Index: voice_engine/channel.cc |
diff --git a/voice_engine/channel.cc b/voice_engine/channel.cc |
index aaca65a36dd65a63384d8e93e32c21af4fd1637d..5a7094179e1ef01126472597058c2395f4b6d923 100644 |
--- a/voice_engine/channel.cc |
+++ b/voice_engine/channel.cc |
@@ -773,7 +773,6 @@ Channel::Channel(int32_t channelId, |
_engineStatisticsPtr(NULL), |
_moduleProcessThreadPtr(NULL), |
_audioDeviceModulePtr(NULL), |
- _voiceEngineObserverPtr(NULL), |
_callbackCritSectPtr(NULL), |
_transportPtr(NULL), |
input_mute_(false), |
@@ -949,7 +948,6 @@ void Channel::Terminate() { |
int32_t Channel::SetEngineInformation(Statistics& engineStatistics, |
ProcessThread& moduleProcessThread, |
AudioDeviceModule& audioDeviceModule, |
- VoiceEngineObserver* voiceEngineObserver, |
rtc::CriticalSection* callbackCritSect, |
rtc::TaskQueue* encoder_queue) { |
RTC_DCHECK(encoder_queue); |
@@ -959,7 +957,6 @@ int32_t Channel::SetEngineInformation(Statistics& engineStatistics, |
_engineStatisticsPtr = &engineStatistics; |
_moduleProcessThreadPtr = &moduleProcessThread; |
_audioDeviceModulePtr = &audioDeviceModule; |
- _voiceEngineObserverPtr = voiceEngineObserver; |
_callbackCritSectPtr = callbackCritSect; |
encoder_queue_ = encoder_queue; |
return 0; |
@@ -1124,36 +1121,6 @@ void Channel::ModifyEncoder( |
audio_coding_->ModifyEncoder(modifier); |
} |
-int32_t Channel::RegisterVoiceEngineObserver(VoiceEngineObserver& observer) { |
- WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), |
- "Channel::RegisterVoiceEngineObserver()"); |
- rtc::CritScope cs(&_callbackCritSect); |
- |
- if (_voiceEngineObserverPtr) { |
- _engineStatisticsPtr->SetLastError( |
- VE_INVALID_OPERATION, kTraceError, |
- "RegisterVoiceEngineObserver() observer already enabled"); |
- return -1; |
- } |
- _voiceEngineObserverPtr = &observer; |
- return 0; |
-} |
- |
-int32_t Channel::DeRegisterVoiceEngineObserver() { |
- WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), |
- "Channel::DeRegisterVoiceEngineObserver()"); |
- rtc::CritScope cs(&_callbackCritSect); |
- |
- if (!_voiceEngineObserverPtr) { |
- _engineStatisticsPtr->SetLastError( |
- VE_INVALID_OPERATION, kTraceWarning, |
- "DeRegisterVoiceEngineObserver() observer already disabled"); |
- return 0; |
- } |
- _voiceEngineObserverPtr = NULL; |
- return 0; |
-} |
- |
int32_t Channel::GetSendCodec(CodecInst& codec) { |
if (cached_send_codec_) { |
codec = *cached_send_codec_; |