Move decision if we need to use WASAPI or wave out into separate function.

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>
 #include <setupapi.h>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "base/win/windows_version.h"
+#include "media/audio/audio_util.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "media/audio/win/audio_low_latency_input_win.h"
 #include "media/audio/win/audio_low_latency_output_win.h"
 #include "media/audio/win/audio_manager_win.h"
 #include "media/audio/win/device_enumeration_win.h"
 #include "media/audio/win/wavein_input_win.h"
 #include "media/audio/win/waveout_output_win.h"
 #include "media/base/limits.h"
 
@@ skipping 61 matching lines @@
   }
 
   SetupDiSetDeviceInstallParams(device_info, device_data,
                                 &old_device_install_params);
 
   return device_and_driver_info;
 }
 
 AudioManagerWin::AudioManagerWin()
     : num_output_streams_(0) {
-  if (base::win::GetVersion() <= base::win::VERSION_XP) {
+  if (!media::IsWASAPISupported()) {
     // Use the Wave API for device enumeration if XP or lower.
     enumeration_type_ = kWaveEnumeration;
   } else {
     // Use the MMDevice API for device enumeration if Vista or higher.
     enumeration_type_ = kMMDeviceEnumeration;
   }
 }
 
 AudioManagerWin::~AudioManagerWin() {
 }
@@ skipping 20 matching lines @@
     return NULL;
   }
 
   if (params.format == AudioParameters::AUDIO_MOCK) {
     return FakeAudioOutputStream::MakeFakeStream(params);
   } else if (params.format == AudioParameters::AUDIO_PCM_LINEAR) {
     num_output_streams_++;
     return new PCMWaveOutAudioOutputStream(this, params, 3, WAVE_MAPPER);
   } else if (params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
     num_output_streams_++;
-    if (base::win::GetVersion() <= base::win::VERSION_XP) {
+    if (!media::IsWASAPISupported()) {
       // Fall back to Windows Wave implementation on Windows XP or lower.
       DLOG(INFO) << "Using WaveOut since WASAPI requires at least Vista.";
       return new PCMWaveOutAudioOutputStream(this, params, 2, 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 WASAPIAudioOutputStream(this, params, eConsole);
     }
   }
   return NULL;
 }
 
 // Factory for the implementations of AudioInputStream.
 AudioInputStream* AudioManagerWin::MakeAudioInputStream(
     const AudioParameters& params, const std::string& device_id) {
   if (!params.IsValid() || (params.channels > kWinMaxInputChannels) ||
       device_id.empty())
     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) {
+    if (!media::IsWASAPISupported()) {
       // Fall back to Windows Wave implementation on Windows XP or lower.
       DLOG(INFO) << "Using WaveIn since WASAPI requires at least Vista.";
       // TODO(xians): Handle the non-default device.
       if (device_id == AudioManagerBase::kDefaultDeviceId)
         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.
       // TODO(xians): Handle the non-default device.
@@ skipping 84 matching lines @@
   return string16();
 }
 
 bool AudioManagerWin::CanShowAudioInputSettings() {
   return true;
 }
 
 void AudioManagerWin::ShowAudioInputSettings() {
   std::wstring program;
   std::string argument;
-  if (base::win::GetVersion() <= base::win::VERSION_XP) {
+  if (!media::IsWASAPISupported()) {
     program = L"sndvol32.exe";
     argument = "-R";
   } else {
     program = L"control.exe";
     argument = "mmsys.cpl,,1";
   }
 
   FilePath path;
   PathService::Get(base::DIR_SYSTEM, &path);
   path = path.Append(program);
@@ skipping 20 matching lines @@
     name.device_name = AudioManagerBase::kDefaultDeviceName;
     name.unique_id = AudioManagerBase::kDefaultDeviceId;
     device_names->push_front(name);
   }
 }
 
 /// static
 AudioManager* AudioManager::CreateAudioManager() {
   return new AudioManagerWin();
 }