Chromium Code Reviews| Index: content/browser/renderer_host/media/audio_input_renderer_host.cc |
| diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
| index 1652b2629590b81b7a3a72dfaa90f433d2fd87ca..3236be5a1cecbacdb606455dc87877ea5a1572de 100644 |
| --- a/content/browser/renderer_host/media/audio_input_renderer_host.cc |
| +++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc |
| @@ -202,7 +202,8 @@ void AudioInputRendererHost::OnStartDevice(int stream_id, int session_id) { |
| } |
| void AudioInputRendererHost::OnCreateStream( |
| - int stream_id, const AudioParameters& params, bool low_latency) { |
| + int stream_id, const AudioParameters& params, bool low_latency, |
| + const std::string& device_uid) { |
| VLOG(1) << "AudioInputRendererHost::OnCreateStream(stream_id=" |
| << stream_id << ")"; |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| @@ -244,10 +245,11 @@ void AudioInputRendererHost::OnCreateStream( |
| // If we have successfully created the SyncWriter then assign it to the |
| // entry and construct an AudioInputController. |
| entry->writer.reset(writer.release()); |
| - entry->controller = |
| - media::AudioInputController::CreateLowLatency(this, |
| - audio_params, |
| - entry->writer.get()); |
| + entry->controller = media::AudioInputController::CreateLowLatency( |
| + this, |
| + audio_params, |
| + device_uid, |
| + entry->writer.get()); |
| if (!entry->controller) { |
| SendErrorMessage(stream_id); |
| @@ -328,7 +330,8 @@ void AudioInputRendererHost::DeleteEntries() { |
| } |
| } |
| -void AudioInputRendererHost::OnDeviceStarted(int session_id, int index) { |
| +void AudioInputRendererHost::OnDeviceStarted( |
| + int session_id, const std::string& device_uid) { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| SessionEntryMap::iterator it = session_entries_.find(session_id); |
| if (it == session_entries_.end()) { |
| @@ -338,7 +341,7 @@ void AudioInputRendererHost::OnDeviceStarted(int session_id, int index) { |
| } |
| // Notify the renderer that the device has been started. |
|
henrika (OOO until Aug 14)
2011/11/16 13:24:02
Perhaps make the comment more clear since the devi
no longer working on chromium
2011/11/16 17:45:48
Done.
|
| - Send(new AudioInputMsg_NotifyDeviceStarted(it->second, index)); |
| + Send(new AudioInputMsg_NotifyDeviceStarted(it->second, device_uid)); |
| } |
| void AudioInputRendererHost::OnDeviceStopped(int session_id) { |