Refactor handling of AudioOptions.

talk/session/media/channelmanager.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 83 matching lines @@
 void ChannelManager::Construct(MediaEngineInterface* me,
                                DataEngineInterface* dme,
                                CaptureManager* cm,
                                rtc::Thread* worker_thread) {
   media_engine_.reset(me);
   data_media_engine_.reset(dme);
   capture_manager_.reset(cm);
   initialized_ = false;
   main_thread_ = rtc::Thread::Current();
   worker_thread_ = worker_thread;
-  // Get the default audio options from the media engine.
-  audio_options_ = media_engine_->GetAudioOptions();
   audio_output_volume_ = kNotSetOutputVolume;
   local_renderer_ = NULL;
   capturing_ = false;
   enable_rtx_ = false;
 
   capture_manager_->SignalCapturerStateChange.connect(
       this, &ChannelManager::OnVideoCaptureStateChange);
 }
 
 ChannelManager::~ChannelManager() {
@@ skipping 82 matching lines @@
         &rtc::Thread::SetAllowBlockingCalls, worker_thread_, false));
   }
 
   initialized_ = worker_thread_->Invoke<bool>(Bind(
       &ChannelManager::InitMediaEngine_w, this));
   ASSERT(initialized_);
   if (!initialized_) {
     return false;
   }
 
-  if (!SetAudioOptions(audio_options_)) {
-    LOG(LS_WARNING) << "Failed to SetAudioOptions with options: "
-                    << audio_options_.ToString();
-  }
-
   // If audio_output_volume_ has been set via SetOutputVolume(), set the
   // audio output volume of the engine.
   if (kNotSetOutputVolume != audio_output_volume_ &&
       !SetOutputVolume(audio_output_volume_)) {
     LOG(LS_WARNING) << "Failed to SetOutputVolume to "
                     << audio_output_volume_;
   }
 
   // Now apply the default video codec that has been set earlier.
   if (default_video_encoder_config_.max_codec.id != 0) {
@@ skipping 197 matching lines @@
   DataChannels::iterator it = std::find(data_channels_.begin(),
       data_channels_.end(), data_channel);
   ASSERT(it != data_channels_.end());
   if (it == data_channels_.end())
     return;
 
   data_channels_.erase(it);
   delete data_channel;
 }
 
-bool ChannelManager::SetAudioOptions(const AudioOptions& options) {
-  // "Get device ids from DeviceManager" - these are the defaults returned.
-  Device in_dev("", -1);
-  Device out_dev("", -1);
-
-  // If we're initialized, pass the settings to the media engine.
-  bool ret = true;
-  if (initialized_) {
-    ret = worker_thread_->Invoke<bool>(
-        Bind(&ChannelManager::SetAudioOptions_w, this,
-             options, &in_dev, &out_dev));
-  }
-
-  // If all worked well, save the values for use in GetAudioOptions.
-  if (ret) {
-    audio_options_ = options;
-  }
-  return ret;
-}
-
-bool ChannelManager::SetAudioOptions_w(
-    const AudioOptions& options,
-    const Device* in_dev, const Device* out_dev) {
-  ASSERT(worker_thread_ == rtc::Thread::Current());
-  ASSERT(initialized_);
-
-  // Set audio options
-  bool ret = media_engine_->SetAudioOptions(options);
-
-  // Set the audio devices
-  if (ret) {
-    ret = media_engine_->SetSoundDevices(in_dev, out_dev);
-  }
-
-  return ret;
-}
-
 bool ChannelManager::GetOutputVolume(int* level) {
   if (!initialized_) {
     return false;
   }
   return worker_thread_->Invoke<bool>(
       Bind(&MediaEngineInterface::GetOutputVolume, media_engine_.get(), level));
 }
 
 bool ChannelManager::SetOutputVolume(int level) {
   bool ret = level >= 0 && level <= 255;
@@ skipping 142 matching lines @@
   return worker_thread_->Invoke<bool>(
       Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file));
 }
 
 void ChannelManager::StopRtcEventLog() {
   worker_thread_->Invoke<void>(
       Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get()));
 }
 
 }  // namespace cricket