Chromium Code Reviews| Index: media/audio/audio_input_controller.cc |
| diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc |
| index 1e264e6039f06d30845dfd400afa637f85f3b62e..715daa47b1ec51e6aaf2d79f10b53fc84adbab6d 100644 |
| --- a/media/audio/audio_input_controller.cc |
| +++ b/media/audio/audio_input_controller.cc |
| @@ -50,9 +50,12 @@ scoped_refptr<AudioInputController> AudioInputController::Create( |
| event_handler, NULL)); |
| // Start the thread and post a task to create the audio input stream. |
| + // Pass an empty string to indicate using default device. |
| + std::string default_device_uid = ""; |
|
henrika (OOO until Aug 14)
2011/11/16 13:24:02
You are mixing empty and "Default".
no longer working on chromium
2011/11/16 17:45:48
I removed ""
|
| controller->thread_.Start(); |
| controller->thread_.message_loop()->PostTask(FROM_HERE, base::Bind( |
| - &AudioInputController::DoCreate, controller.get(), params)); |
| + &AudioInputController::DoCreate, controller.get(), |
| + params, default_device_uid)); |
| return controller; |
| } |
| @@ -60,6 +63,7 @@ scoped_refptr<AudioInputController> AudioInputController::Create( |
| scoped_refptr<AudioInputController> AudioInputController::CreateLowLatency( |
| EventHandler* event_handler, |
| const AudioParameters& params, |
| + const std::string& device_uid, |
| SyncWriter* sync_writer) { |
| DCHECK(sync_writer); |
| @@ -76,7 +80,7 @@ scoped_refptr<AudioInputController> AudioInputController::CreateLowLatency( |
| // Start the thread and post a task to create the audio input stream. |
| controller->thread_.Start(); |
| controller->thread_.message_loop()->PostTask(FROM_HERE, base::Bind( |
| - &AudioInputController::DoCreate, controller.get(), params)); |
| + &AudioInputController::DoCreate, controller.get(), params, device_uid)); |
| return controller; |
| } |
| @@ -108,8 +112,10 @@ void AudioInputController::Close() { |
| thread_.Stop(); |
| } |
| -void AudioInputController::DoCreate(const AudioParameters& params) { |
| - stream_ = AudioManager::GetAudioManager()->MakeAudioInputStream(params); |
| +void AudioInputController::DoCreate(const AudioParameters& params, |
| + const std::string& device_uid) { |
| + stream_ = AudioManager::GetAudioManager()->MakeAudioInputStream(params, |
| + device_uid); |
| if (!stream_) { |
| // TODO(satish): Define error types. |