Remove voice_engine_ member variable and GetVoiceEngine() from ViEChannelManager.
This is dead code right now and since the implementation of GetVoiceEngine() grabbed a lock and returned a raw pointer, it's not to be trusted anyway :)
R=mflodman@webrtc.org
BUG=
Review URL: https://webrtc-codereview.appspot.com/37869005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@8306 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/video_engine/vie_channel_manager.cc b/video_engine/vie_channel_manager.cc
index a2dca8a..dccd324 100644
--- a/video_engine/vie_channel_manager.cc
+++ b/video_engine/vie_channel_manager.cc
@@ -38,7 +38,6 @@
free_channel_ids_(new bool[kViEMaxNumberOfChannels]),
free_channel_ids_size_(kViEMaxNumberOfChannels),
voice_sync_interface_(NULL),
- voice_engine_(NULL),
module_process_thread_(NULL),
engine_config_(config) {
for (int idx = 0; idx < free_channel_ids_size_; idx++) {
@@ -313,7 +312,6 @@
if (voice_sync_interface_) {
voice_sync_interface_->Release();
}
- voice_engine_ = voice_engine;
voice_sync_interface_ = sync_interface;
return 0;
}
@@ -342,11 +340,6 @@
return -1;
}
-VoiceEngine* ViEChannelManager::GetVoiceEngine() {
- CriticalSectionScoped cs(channel_id_critsect_);
- return voice_engine_;
-}
-
bool ViEChannelManager::SetRembStatus(int channel_id, bool sender,
bool receiver) {
CriticalSectionScoped cs(channel_id_critsect_);
diff --git a/video_engine/vie_channel_manager.h b/video_engine/vie_channel_manager.h
index 2112dac..ece8a5a 100644
--- a/video_engine/vie_channel_manager.h
+++ b/video_engine/vie_channel_manager.h
@@ -70,8 +70,6 @@
// Disables lip sync of the channel.
int DisconnectVoiceChannel(int channel_id);
- VoiceEngine* GetVoiceEngine();
-
// Adds a channel to include when sending REMB.
bool SetRembStatus(int channel_id, bool sender, bool receiver);
@@ -142,7 +140,6 @@
EncoderMap vie_encoder_map_;
VoEVideoSync* voice_sync_interface_;
- VoiceEngine* voice_engine_;
ProcessThread* module_process_thread_;
const Config& engine_config_;
};
