Link things together and enable the device selection for linux and mac.

content/browser/renderer_host/media/audio_input_device_manager.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager_event_handler.h"
 #include "content/public/browser/browser_thread.h"
-#include "media/audio/audio_manager.h"
+#include "media/audio/audio_manager_base.h"
 
 using content::BrowserThread;
 
 namespace media_stream {
 
 const int AudioInputDeviceManager::kFakeOpenSessionId = 1;
 const int AudioInputDeviceManager::kInvalidSessionId = 0;
-const int AudioInputDeviceManager::kInvalidDevice = -1;
-const int AudioInputDeviceManager::kDefaultDeviceIndex = 0;
+const char AudioInputDeviceManager::kInvalidDeviceUId[] = "";
 
 // Starting id for the first capture session.
 const int kFirstSessionId = AudioInputDeviceManager::kFakeOpenSessionId + 1;
 
 // Helper function.
 static bool IsValidAudioInputDevice(const media::AudioDeviceName& device) {
   AudioManager* audio_manager = AudioManager::GetAudioManager();
   if (!audio_manager)
     return false;
 
@@ skipping 73 matching lines @@
 void AudioInputDeviceManager::Start(
     int session_id, AudioInputDeviceManagerEventHandler* event_handler) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(event_handler);
 
   // Solution for not using MediaStreamManager. This is needed when Start() is
   // called without using Open(), we post 0(default device) for test purpose.
   // And we do not store the info for the kFakeOpenSessionId but return
   // the callback immediately.
   if (session_id == kFakeOpenSessionId) {
-    event_handler->OnDeviceStarted(session_id, kDefaultDeviceIndex);
+    event_handler->OnDeviceStarted(session_id,
+                                   AudioManagerBase::kDefaultDeviceId);

[henrika (OOO until Aug 14), 2011/11/16 13:24:02]

We mix UId and Id here. Not sure why?

[no longer working on chromium, 2011/11/16 17:45:48]

When it is kFakeOpenSessionId, which is 1, then we open default device
regardless if the device has been opened or not.

     return;
   }
 
   // If session has been started, post a callback with an error.
   if (event_handlers_.find(session_id) != event_handlers_.end()) {
     // Session has been started, post a callback with error.
-    event_handler->OnDeviceStarted(session_id, kInvalidDevice);
+    event_handler->OnDeviceStarted(session_id, kInvalidDeviceUId);
     return;
   }
 
   // Add the event handler to the session.
   event_handlers_.insert(std::make_pair(session_id, event_handler));
 
   audio_input_device_thread_.message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&AudioInputDeviceManager::StartOnDeviceThread,
                  base::Unretained(this), session_id));
@@ skipping 64 matching lines @@
                           FROM_HERE,
                           base::Bind(
                               &AudioInputDeviceManager::ClosedOnIOThread,
                               base::Unretained(this),
                               session_id));
 }
 
 void AudioInputDeviceManager::StartOnDeviceThread(const int session_id) {
   DCHECK(IsOnCaptureDeviceThread());
 
   // Get the up-to-date device enumeration list from the system and find out

[henrika (OOO until Aug 14), 2011/11/16 13:24:02]

I really hate fuzzy phrases like "the system" ;-( 

[no longer working on chromium, 2011/11/16 17:45:48]

Done.

   // the index of the device.

[henrika (OOO until Aug 14), 2011/11/16 13:24:02]

This comment is old.

[no longer working on chromium, 2011/11/16 17:45:48]

Done.

-  int device_index = kInvalidDevice;
+  std::string device_uid = kInvalidDeviceUId;
   AudioInputDeviceMap::const_iterator it = devices_.find(session_id);
   if (it != devices_.end()) {
     media::AudioDeviceNames device_names;
     AudioManager::GetAudioManager()->GetAudioInputDeviceNames(&device_names);
     if (!device_names.empty()) {
       int index = 0;
       for (media::AudioDeviceNames::iterator iter = device_names.begin();
            iter != device_names.end();
            ++iter, ++index) {
         if (iter->device_name == it->second.device_name &&
             iter->unique_id == it->second.unique_id) {
           // Found the device.
-          device_index = index;
+          device_uid = iter->unique_id;
           break;
         }
       }
     }
   }
   // Posts the index to AudioInputRenderHost through the event handler.

[henrika (OOO until Aug 14), 2011/11/16 13:24:02]

new line?

[no longer working on chromium, 2011/11/16 17:45:48]

Done.

   BrowserThread::PostTask(BrowserThread::IO,
                           FROM_HERE,
                           base::Bind(
                               &AudioInputDeviceManager::StartedOnIOThread,
                               base::Unretained(this),
                               session_id,
-                              device_index));
+                              device_uid));
 }
 
 void AudioInputDeviceManager::StopOnDeviceThread(int session_id) {
   DCHECK(IsOnCaptureDeviceThread());
   BrowserThread::PostTask(BrowserThread::IO,
                           FROM_HERE,
                           base::Bind(
                               &AudioInputDeviceManager::StoppedOnIOThread,
                               base::Unretained(this),
                               session_id));
@@ skipping 24 matching lines @@
 }
 
 
 void AudioInputDeviceManager::ErrorOnIOThread(int session_id,
                                               MediaStreamProviderError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (listener_)
     listener_->Error(kAudioCapture, session_id, error);
 }
 
-void AudioInputDeviceManager::StartedOnIOThread(int session_id, int index) {
+void AudioInputDeviceManager::StartedOnIOThread(
+    int session_id, const std::string& device_uid) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   EventHandlerMap::iterator it = event_handlers_.find(session_id);
   if (it == event_handlers_.end())
     return;
 
   // Post a callback through the event handler to create an audio stream.

[henrika (OOO until Aug 14), 2011/11/16 13:24:02]

Please add more info here about what is the next step.

[no longer working on chromium, 2011/11/16 17:45:48]

Done.

-  it->second->OnDeviceStarted(session_id, index);
+  it->second->OnDeviceStarted(session_id, device_uid);
 }
 
 void AudioInputDeviceManager::StoppedOnIOThread(int session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // Erase the event handler referenced by the session_id.
   event_handlers_.erase(session_id);
 }
 
 void AudioInputDeviceManager::SignalError(int session_id,
                                           MediaStreamProviderError error) {
@@ skipping 18 matching lines @@
 bool AudioInputDeviceManager::HasEventHandler(int session_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return event_handlers_.find(session_id) != event_handlers_.end();
 }
 
 MessageLoop* AudioInputDeviceManager::message_loop() {
   return audio_input_device_thread_.message_loop();
 }
 
 }  // namespace media_stream