Refactor handling of AudioOptions.

talk/media/base/mediaengine.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 70 matching lines @@
   // Creates a voice media channel. Returns NULL on failure.
   virtual VoiceMediaChannel* CreateChannel(
       webrtc::Call* call,
       const AudioOptions& options) = 0;
   // Creates a video media channel, paired with the specified voice channel.
   // Returns NULL on failure.
   virtual VideoMediaChannel* CreateVideoChannel(
       webrtc::Call* call,
       const VideoOptions& options) = 0;
 
-  // Configuration
-  // Gets global audio options.
-  virtual AudioOptions GetAudioOptions() const = 0;
-  // Sets global audio options. "options" are from AudioOptions, above.
-  virtual bool SetAudioOptions(const AudioOptions& options) = 0;
   // Sets the default (maximum) codec/resolution and encoder option to capture
   // and encode video.
   virtual bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config)
       = 0;
 
-  // Device selection
-  virtual bool SetSoundDevices(const Device* in_device,
-                               const Device* out_device) = 0;
-
   // Device configuration
   // Gets the current speaker volume, as a value between 0 and 255.
   virtual bool GetOutputVolume(int* level) = 0;
   // Sets the current speaker volume, as a value between 0 and 255.
   virtual bool SetOutputVolume(int level) = 0;
 
   // Gets the current microphone level, as a value between 0 and 10.
   virtual int GetInputLevel() = 0;
 
   virtual const std::vector<AudioCodec>& audio_codecs() = 0;
@@ skipping 54 matching lines @@
   }
   virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
                                            const AudioOptions& options) {
     return voice_.CreateChannel(call, options);
   }
   virtual VideoMediaChannel* CreateVideoChannel(webrtc::Call* call,
                                                 const VideoOptions& options) {
     return video_.CreateChannel(call, options);
   }
 
-  virtual AudioOptions GetAudioOptions() const {
-    return voice_.GetOptions();
-  }
-  virtual bool SetAudioOptions(const AudioOptions& options) {
-    return voice_.SetOptions(options);
-  }
   virtual bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config) {
     return video_.SetDefaultEncoderConfig(config);
   }
 
-  virtual bool SetSoundDevices(const Device* in_device,
-                               const Device* out_device) {
-    return voice_.SetDevices(in_device, out_device);
-  }
-
   virtual bool GetOutputVolume(int* level) {
     return voice_.GetOutputVolume(level);
   }
   virtual bool SetOutputVolume(int level) {
     return voice_.SetOutputVolume(level);
   }
 
   virtual int GetInputLevel() {
     return voice_.GetInputLevel();
   }
@@ skipping 38 matching lines @@
 class DataEngineInterface {
  public:
   virtual ~DataEngineInterface() {}
   virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0;
   virtual const std::vector<DataCodec>& data_codecs() = 0;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_MEDIAENGINE_H_