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

media/audio/win/audio_manager_win.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_io.h"
 
 #include <windows.h>
 #include <objbase.h>  // This has to be before initguid.h
 #include <initguid.h>
 #include <mmsystem.h>
@@ skipping 122 matching lines @@
   } else if (params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
     num_output_streams_++;
     // TODO(cpu): waveout cannot hit 20ms latency. Use other method.
     return new PCMWaveOutAudioOutputStream(this, params, 2, WAVE_MAPPER);
   }
   return NULL;
 }
 
 // Factory for the implementations of AudioInputStream.
 AudioInputStream* AudioManagerWin::MakeAudioInputStream(
-    const AudioParameters& params) {
+    const AudioParameters& params, const std::string& device_uid) {
   if (!params.IsValid() || (params.channels > kWinMaxInputChannels))
     return NULL;
 
   if (params.format == AudioParameters::AUDIO_MOCK) {
     return FakeAudioInputStream::MakeFakeStream(params);
   } else if (params.format == AudioParameters::AUDIO_PCM_LINEAR) {
     return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
                                          WAVE_MAPPER);
   } else if (params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
     if (base::win::GetVersion() <= base::win::VERSION_XP) {
       // Fall back to Windows Wave implementation on Windows XP or lower.
       DLOG(INFO) << "Using WaveIn since WASAPI requires at least Vista.";
-      return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
-                                           WAVE_MAPPER);
+      // TODO(xians): Handle the non-default device.
+      if ((device_uid == AudioManagerBase::kDefaultDeviceId) ||
+          device_uid.empty())
+        return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
+                                             WAVE_MAPPER);
     } else {
       // TODO(henrika): improve possibility to specify audio endpoint.
       // Use the default device (same as for Wave) for now to be compatible.
-      return new WASAPIAudioInputStream(this, params, eConsole);
+      // TODO(xians): Handle the non-default device.
+      if ((device_uid == AudioManagerBase::kDefaultDeviceId) ||
+          device_uid.empty())
+        return new WASAPIAudioInputStream(this, params, eConsole);
     }
   }
   return NULL;
 }
 
 void AudioManagerWin::ReleaseOutputStream(PCMWaveOutAudioOutputStream* stream) {
   DCHECK(stream);
   num_output_streams_--;
   delete stream;
 }
@@ skipping 95 matching lines @@
 
 void AudioManagerWin::GetAudioInputDeviceNames(
     media::AudioDeviceNames* device_names) {
   // TODO(xians): query a full list of valid devices.
   if (HasAudioInputDevices()) {
     // Add the default device to the list.
     // We use index 0 to make up the unique_id to identify the
     // default devices.
     media::AudioDeviceName name;
     name.device_name = AudioManagerBase::kDefaultDeviceName;
-    name.unique_id = "0";
+    name.unique_id = AudioManagerBase::kDefaultDeviceId;
     device_names->push_back(name);
   }
 }
 
 // static
 AudioManager* AudioManager::CreateAudioManager() {
   return new AudioManagerWin();
 }