Remove the SetLocalMonitor() API.

talk/media/webrtc/webrtcvoiceengine.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 351 matching lines @@
 static std::string GetEnableString(bool enable) {
   return enable ? "enable" : "disable";
 }
 
 WebRtcVoiceEngine::WebRtcVoiceEngine()
     : voe_wrapper_(new VoEWrapper()),
       tracing_(new VoETraceWrapper()),
       adm_(NULL),
       log_filter_(SeverityToFilter(kDefaultLogSeverity)),
       is_dumping_aec_(false),
-      desired_local_monitor_enable_(false),
       tx_processor_ssrc_(0),
       rx_processor_ssrc_(0) {
   Construct();
 }
 
 WebRtcVoiceEngine::WebRtcVoiceEngine(VoEWrapper* voe_wrapper,
                                      VoETraceWrapper* tracing)
     : voe_wrapper_(voe_wrapper),
       tracing_(tracing),
       adm_(NULL),
       log_filter_(SeverityToFilter(kDefaultLogSeverity)),
       is_dumping_aec_(false),
-      desired_local_monitor_enable_(false),
       tx_processor_ssrc_(0),
       rx_processor_ssrc_(0) {
   Construct();
 }
 
 void WebRtcVoiceEngine::Construct() {
   SetTraceFilter(log_filter_);
   initialized_ = false;
   LOG(LS_VERBOSE) << "WebRtcVoiceEngine::WebRtcVoiceEngine";
   SetTraceOptions("");
@@ skipping 169 matching lines @@
   return true;
 }
 
 void WebRtcVoiceEngine::Terminate() {
   LOG(LS_INFO) << "WebRtcVoiceEngine::Terminate";
   initialized_ = false;
 
   StopAecDump();
 
   voe_wrapper_->base()->Terminate();
-  desired_local_monitor_enable_ = false;
 }
 
 int WebRtcVoiceEngine::GetCapabilities() {
   return AUDIO_SEND | AUDIO_RECV;
 }
 
 VoiceMediaChannel* WebRtcVoiceEngine::CreateChannel(webrtc::Call* call,
     const AudioOptions& options) {
   WebRtcVoiceMediaChannel* ch =
       new WebRtcVoiceMediaChannel(this, options, call);
@@ skipping 340 matching lines @@
 #endif
 
   std::string in_name = (in_id != kDefaultAudioDeviceId) ?
       in_device->name : "Default device";
   std::string out_name = (out_id != kDefaultAudioDeviceId) ?
       out_device->name : "Default device";
   LOG(LS_INFO) << "Setting microphone to (id=" << in_id << ", name=" << in_name
             << ") and speaker to (id=" << out_id << ", name=" << out_name
             << ")";
 
-  // If we're running the local monitor, we need to stop it first.
+  // Must also pause all audio playback and capture.
   bool ret = true;
-  if (!PauseLocalMonitor()) {
-    LOG(LS_WARNING) << "Failed to pause local monitor";
-    ret = false;
-  }
-
-  // Must also pause all audio playback and capture.
   for (WebRtcVoiceMediaChannel* channel : channels_) {
     if (!channel->PausePlayout()) {
       LOG(LS_WARNING) << "Failed to pause playout";
       ret = false;
     }
     if (!channel->PauseSend()) {
       LOG(LS_WARNING) << "Failed to pause send";
       ret = false;
     }
   }
@@ skipping 29 matching lines @@
     if (!channel->ResumePlayout()) {
       LOG(LS_WARNING) << "Failed to resume playout";
       ret = false;
     }
     if (!channel->ResumeSend()) {
       LOG(LS_WARNING) << "Failed to resume send";
       ret = false;
     }
   }
 
-  // Resume local monitor.
-  if (!ResumeLocalMonitor()) {
-    LOG(LS_WARNING) << "Failed to resume local monitor";
-    ret = false;
-  }
-
   if (ret) {
     LOG(LS_INFO) << "Set microphone to (id=" << in_id <<" name=" << in_name
                  << ") and speaker to (id="<< out_id << " name=" << out_name
                  << ")";
   }
 
   return ret;
 #else
   return true;
 #endif  // !IOS
@@ skipping 67 matching lines @@
   }
   return true;
 }
 
 int WebRtcVoiceEngine::GetInputLevel() {
   unsigned int ulevel;
   return (voe_wrapper_->volume()->GetSpeechInputLevel(ulevel) != -1) ?
       static_cast<int>(ulevel) : -1;
 }
 
-bool WebRtcVoiceEngine::SetLocalMonitor(bool enable) {
-  desired_local_monitor_enable_ = enable;
-  return ChangeLocalMonitor(desired_local_monitor_enable_);
-}
-
-bool WebRtcVoiceEngine::ChangeLocalMonitor(bool enable) {
-  // The voe file api is not available in chrome.
-  if (!voe_wrapper_->file()) {
-    return false;
-  }
-  if (enable && !monitor_) {
-    monitor_.reset(new WebRtcMonitorStream);
-    if (voe_wrapper_->file()->StartRecordingMicrophone(monitor_.get()) == -1) {
-      LOG_RTCERR1(StartRecordingMicrophone, monitor_.get());
-      // Must call Stop() because there are some cases where Start will report
-      // failure but still change the state, and if we leave VE in the on state
-      // then it could crash later when trying to invoke methods on our monitor.
-      voe_wrapper_->file()->StopRecordingMicrophone();
-      monitor_.reset();
-      return false;
-    }
-  } else if (!enable && monitor_) {
-    voe_wrapper_->file()->StopRecordingMicrophone();
-    monitor_.reset();
-  }
-  return true;
-}
-
-bool WebRtcVoiceEngine::PauseLocalMonitor() {
-  return ChangeLocalMonitor(false);
-}
-
-bool WebRtcVoiceEngine::ResumeLocalMonitor() {
-  return ChangeLocalMonitor(desired_local_monitor_enable_);
-}
-
 const std::vector<AudioCodec>& WebRtcVoiceEngine::codecs() {
   return codecs_;
 }
 
 bool WebRtcVoiceEngine::FindCodec(const AudioCodec& in) {
   return FindWebRtcCodec(in, NULL);
 }
 
 // Get the VoiceEngine codec that matches |in|, with the supplied settings.
 bool WebRtcVoiceEngine::FindWebRtcCodec(const AudioCodec& in,
@@ skipping 2418 matching lines @@
       LOG(LS_WARNING) << "Unknown codec " << ToString(codec);
       return false;
     }
   }
   return true;
 }
 
 }  // namespace cricket
 
 #endif  // HAVE_WEBRTC_VOICE