Index: media/audio/audio_output_controller.h |
diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h |
index 38a2c03f590faa18dd9c2ca65cf559da6feff23b..6c906ed39c993dfe9ce8aad75930d567e931faae 100644 |
--- a/media/audio/audio_output_controller.h |
+++ b/media/audio/audio_output_controller.h |
@@ -103,8 +103,8 @@ class MEDIA_EXPORT AudioOutputController |
// outlive AudioOutputController. |
henrika (OOO until Aug 14)
2013/09/06 08:44:38
Should we extend the comment and mention device ID
tommi (sloooow) - chröme
2013/09/06 11:01:35
Done.
|
static scoped_refptr<AudioOutputController> Create( |
AudioManager* audio_manager, EventHandler* event_handler, |
- const AudioParameters& params, const std::string& input_device_id, |
- SyncReader* sync_reader); |
+ const AudioParameters& params, const std::string& output_device_id, |
+ const std::string& input_device_id, SyncReader* sync_reader); |
// Methods to control playback of the stream. |
@@ -166,6 +166,7 @@ class MEDIA_EXPORT AudioOutputController |
AudioOutputController(AudioManager* audio_manager, EventHandler* handler, |
const AudioParameters& params, |
+ const std::string& output_device_id, |
const std::string& input_device_id, |
SyncReader* sync_reader); |
@@ -198,8 +199,12 @@ class MEDIA_EXPORT AudioOutputController |
const AudioParameters params_; |
EventHandler* const handler_; |
+ // Specified the device id of the output device to open or empty for the |
henrika (OOO until Aug 14)
2013/09/06 08:44:38
Specified the device id of... sounds odd to me. Di
tommi (sloooow) - chröme
2013/09/06 11:01:35
Yes, thanks, fixed.
|
+ // default output device. |
+ const std::string output_device_id_; |
+ |
// Used by the unified IO to open the correct input device. |
- std::string input_device_id_; |
+ const std::string input_device_id_; |
AudioOutputStream* stream_; |