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

media/audio/audio_input_controller.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 "media/audio/audio_input_controller.h"
 
 #include "base/bind.h"
 #include "base/threading/thread_restrictions.h"
 #include "media/base/limits.h"
 
@@ skipping 32 matching lines @@
     return NULL;
 
   if (factory_) {
     return factory_->Create(event_handler, params);
   }
 
   scoped_refptr<AudioInputController> controller(new AudioInputController(
       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 device_id = AudioManagerBase::kDefaultDeviceId;
   controller->thread_.Start();
   controller->thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
-      &AudioInputController::DoCreate, controller.get(), params));
+      &AudioInputController::DoCreate, controller.get(),
+      params, device_id));
   return controller;
 }
 
 // static
 scoped_refptr<AudioInputController> AudioInputController::CreateLowLatency(
     EventHandler* event_handler,
     const AudioParameters& params,
+    const std::string& device_id,
     SyncWriter* sync_writer) {
   DCHECK(sync_writer);
 
   if (!params.IsValid() || (params.channels > kMaxInputChannels))
     return NULL;
 
   if (!AudioManager::GetAudioManager())
     return NULL;
 
   // Starts the audio controller thread.
   scoped_refptr<AudioInputController> controller(new AudioInputController(
       event_handler, sync_writer));
 
   // 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_id));
   return controller;
 }
 
 void AudioInputController::Record() {
   DCHECK(thread_.IsRunning());
   thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
       &AudioInputController::DoRecord, this));
 }
 
 void AudioInputController::Close() {
@@ skipping 11 matching lines @@
   // This is because as joining threads may be a long operation it's now
   // not allowed in threads without IO access, which is the case of the IO
   // thread (it is missnamed) being used here. This object overrides
   // temporarily this restriction and should be used only in specific
   // infrequent cases where joining is guaranteed to be fast.
   // Bug: http://code.google.com/p/chromium/issues/detail?id=67806
   base::ThreadRestrictions::ScopedAllowIO allow_io_for_thread_join;
   thread_.Stop();
 }
 
-void AudioInputController::DoCreate(const AudioParameters& params) {
-  stream_ = AudioManager::GetAudioManager()->MakeAudioInputStream(params);
+void AudioInputController::DoCreate(const AudioParameters& params,
+                                    const std::string& device_id) {
+  stream_ = AudioManager::GetAudioManager()->MakeAudioInputStream(params,
+                                                                  device_id);
 
   if (!stream_) {
     // TODO(satish): Define error types.
     handler_->OnError(this, 0);
     return;
   }
 
   if (stream_ && !stream_->Open()) {
     stream_->Close();
     stream_ = NULL;
@@ skipping 86 matching lines @@
   // such cases here.
 }
 
 void AudioInputController::OnError(AudioInputStream* stream, int code) {
   // Handle error on the audio controller thread.
   thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
       &AudioInputController::DoReportError, this, code));
 }
 
 }  // namespace media