| Index: media/audio/audio_output_dispatcher.h
|
| diff --git a/media/audio/audio_output_dispatcher.h b/media/audio/audio_output_dispatcher.h
|
| index 69c5f16edfd348e51901046f0b43558cfd36b362..d070b6b243eb3b75ae0d2b0061e6c10f4c2599ff 100644
|
| --- a/media/audio/audio_output_dispatcher.h
|
| +++ b/media/audio/audio_output_dispatcher.h
|
| @@ -38,8 +38,7 @@ class MEDIA_EXPORT AudioOutputDispatcher
|
| public:
|
| AudioOutputDispatcher(AudioManager* audio_manager,
|
| const AudioParameters& params,
|
| - const std::string& output_device_id,
|
| - const std::string& input_device_id);
|
| + const std::string& device_id);
|
|
|
| // Called by AudioOutputProxy to open the stream.
|
| // Returns false, if it fails to open it.
|
| @@ -73,8 +72,7 @@ class MEDIA_EXPORT AudioOutputDispatcher
|
| virtual void CloseStreamsForWedgeFix() = 0;
|
| virtual void RestartStreamsForWedgeFix() = 0;
|
|
|
| - // Accessor to the input device id used by unified IO.
|
| - const std::string& input_device_id() const { return input_device_id_; }
|
| + const std::string& device_id() const { return device_id_; }
|
|
|
| protected:
|
| friend class base::RefCountedThreadSafe<AudioOutputDispatcher>;
|
| @@ -85,8 +83,7 @@ class MEDIA_EXPORT AudioOutputDispatcher
|
| AudioManager* audio_manager_;
|
| const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
| const AudioParameters params_;
|
| - std::string output_device_id_;
|
| - const std::string input_device_id_;
|
| + std::string device_id_;
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(AudioOutputDispatcher);
|
|
|