Remove use of DeviceManager from ChannelManager.

talk/session/media/channelmanager.h

 /*
  * 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 47 matching lines @@
 // ChannelManager also allows the application to discover what devices it has
 // using device manager.
 class ChannelManager : public rtc::MessageHandler,
                        public sigslot::has_slots<> {
  public:
   // For testing purposes. Allows the media engine and data media
   // engine and dev manager to be mocks.  The ChannelManager takes
   // ownership of these objects.
   ChannelManager(MediaEngineInterface* me,
                  DataEngineInterface* dme,
-                 DeviceManagerInterface* dm,
                  CaptureManager* cm,
                  rtc::Thread* worker);
   // Same as above, but gives an easier default DataEngine.
   ChannelManager(MediaEngineInterface* me,
-                 DeviceManagerInterface* dm,
                  rtc::Thread* worker);
   ~ChannelManager();
 
   // Accessors for the worker thread, allowing it to be set after construction,
   // but before Init. set_worker_thread will return false if called after Init.
   rtc::Thread* worker_thread() const { return worker_thread_; }
   bool set_worker_thread(rtc::Thread* thread) {
     if (initialized_) return false;
     worker_thread_ = thread;
     return true;
@@ skipping 44 matching lines @@
                                  bool rtcp,
                                  DataChannelType data_channel_type);
   // Destroys a data channel created with the Create API.
   void DestroyDataChannel(DataChannel* data_channel);
 
   // Indicates whether any channels exist.
   bool has_channels() const {
     return (!voice_channels_.empty() || !video_channels_.empty());
   }
 
-  // Configures the audio and video devices. A null pointer can be passed to
-  // GetAudioOptions() for any parameter of no interest.
-  bool GetAudioOptions(std::string* wave_in_device,
-                       std::string* wave_out_device,
-                       AudioOptions* options);
-  bool SetAudioOptions(const std::string& wave_in_device,
-                       const std::string& wave_out_device,
-                       const AudioOptions& options);
   bool GetOutputVolume(int* level);
   bool SetOutputVolume(int level);
-  bool IsSameCapturer(const std::string& capturer_name,
-                      VideoCapturer* capturer);
-  // TODO(noahric): Nearly everything called "device" in this API is actually a
-  // device name, so this should really be GetCaptureDeviceName, and the
-  // next method should be GetCaptureDevice.
-  bool GetCaptureDevice(std::string* cam_device);
-  // Gets the current capture Device.
-  bool GetVideoCaptureDevice(Device* device);
-  // Create capturer based on what has been set in SetCaptureDevice().
-  VideoCapturer* CreateVideoCapturer();
-  // Create capturer from a screen.
-  VideoCapturer* CreateScreenCapturer(const ScreencastId& screenid);
-  bool SetCaptureDevice(const std::string& cam_device);
   bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config);
   // RTX will be enabled/disabled in engines that support it. The supporting
   // engines will start offering an RTX codec. Must be called before Init().
   bool SetVideoRtxEnabled(bool enable);
 
   // Starts/stops the local microphone and enables polling of the input level.
   bool capturing() const { return capturing_; }
 
   // Configures the logging output of the mediaengine(s).
   void SetVoiceLogging(int level, const char* filter);
@@ skipping 18 matching lines @@
                            const VideoFormat& previous_format,
                            const VideoFormat& desired_format,
                            CaptureManager::RestartOptions options);
 
   bool AddVideoRenderer(VideoCapturer* capturer, VideoRenderer* renderer);
   bool RemoveVideoRenderer(VideoCapturer* capturer, VideoRenderer* renderer);
   bool IsScreencastRunning() const;
 
   // The operations below occur on the main thread.
 
-  bool GetAudioInputDevices(std::vector<std::string>* names);
-  bool GetAudioOutputDevices(std::vector<std::string>* names);
-  bool GetVideoCaptureDevices(std::vector<std::string>* names);
-  void SetVideoCaptureDeviceMaxFormat(const std::string& usb_id,
-                                      const VideoFormat& max_format);
-
   // Starts AEC dump using existing file.
   bool StartAecDump(rtc::PlatformFile file);
 
-  sigslot::repeater0<> SignalDevicesChange;
   sigslot::signal2<VideoCapturer*, CaptureState> SignalVideoCaptureStateChange;
 
-  // Returns the current selected device. Note: Subtly different from
-  // GetCaptureDevice(). See member video_device_ for more details.
-  // This API is mainly a hook used by unittests.
-  const std::string& video_device_name() const { return video_device_name_; }
-
-
  protected:
   // Adds non-transient parameters which can only be changed through the
   // options store.
-  bool SetAudioOptions(const std::string& wave_in_device,
-                       const std::string& wave_out_device,
-                       const AudioOptions& options,
-                       int delay_offset);
+  bool SetAudioOptions(const AudioOptions& options, int delay_offset);
   int audio_delay_offset() const { return audio_delay_offset_; }
-  // This is here so that ChannelManager subclasses can set the video
-  // capturer factories to use.
-  DeviceManagerInterface* device_manager() { return device_manager_.get(); }
 
  private:
   typedef std::vector<VoiceChannel*> VoiceChannels;
   typedef std::vector<VideoChannel*> VideoChannels;
   typedef std::vector<DataChannel*> DataChannels;
 
   void Construct(MediaEngineInterface* me,
                  DataEngineInterface* dme,
-                 DeviceManagerInterface* dm,
                  CaptureManager* cm,
                  rtc::Thread* worker_thread);
   bool InitMediaEngine_w();
   void DestructorDeletes_w();
   void Terminate_w();
   VoiceChannel* CreateVoiceChannel_w(
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
       bool rtcp,
       const AudioOptions& options);
   void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
   VideoChannel* CreateVideoChannel_w(
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
       bool rtcp,
       const VideoOptions& options);
   void DestroyVideoChannel_w(VideoChannel* video_channel);
   DataChannel* CreateDataChannel_w(TransportController* transport_controller,
                                    const std::string& content_name,
                                    bool rtcp,
                                    DataChannelType data_channel_type);
   void DestroyDataChannel_w(DataChannel* data_channel);
   bool SetAudioOptions_w(const AudioOptions& options, int delay_offset,
                          const Device* in_dev, const Device* out_dev);
-  bool SetCaptureDevice_w(const Device* cam_device);
   void OnVideoCaptureStateChange(VideoCapturer* capturer,
                                  CaptureState result);
   void GetSupportedFormats_w(
       VideoCapturer* capturer,
       std::vector<cricket::VideoFormat>* out_formats) const;
   bool IsScreencastRunning_w() const;
   virtual void OnMessage(rtc::Message *message);
 
   rtc::scoped_ptr<MediaEngineInterface> media_engine_;
   rtc::scoped_ptr<DataEngineInterface> data_media_engine_;
-  rtc::scoped_ptr<DeviceManagerInterface> device_manager_;
   rtc::scoped_ptr<CaptureManager> capture_manager_;
   bool initialized_;
   rtc::Thread* main_thread_;
   rtc::Thread* worker_thread_;
 
   VoiceChannels voice_channels_;
   VideoChannels video_channels_;
   DataChannels data_channels_;
 
-  std::string audio_in_device_;
-  std::string audio_out_device_;
   AudioOptions audio_options_;
   int audio_delay_offset_;
   int audio_output_volume_;
-  std::string camera_device_;
   VideoEncoderConfig default_video_encoder_config_;
   VideoRenderer* local_renderer_;
   bool enable_rtx_;
 
   bool capturing_;
-
-  // String containing currently set device. Note that this string is subtly
-  // different from camera_device_. E.g. camera_device_ will list unplugged
-  // but selected devices while this sting will be empty or contain current
-  // selected device.
-  // TODO(hellner): refactor the code such that there is no need to keep two
-  // strings for video devices that have subtle differences in behavior.
-  std::string video_device_name_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_CHANNELMANAGER_H_