diff options
| author | enal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-03 04:14:45 +0000 |
|---|---|---|
| committer | enal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-03 04:14:45 +0000 |
| commit | 0474f0f587ab6208e1c8aaa13a0210759d943a75 (patch) | |
| tree | 06f387c44bd5860f6601ba7a13da5e40d72783d3 /media/audio/win | |
| parent | a3a4a580df1f6b45d722612da5c993087019bb2d (diff) | |
| download | chromium_src-0474f0f587ab6208e1c8aaa13a0210759d943a75.zip chromium_src-0474f0f587ab6208e1c8aaa13a0210759d943a75.tar.gz chromium_src-0474f0f587ab6208e1c8aaa13a0210759d943a75.tar.bz2 | |
Move decision if we need to use WASAPI or wave out into separate function.
Minor Windows-only code cleanup. That also fixes broken sound on Windows Server 2003.
BUG=none
Review URL: http://codereview.chromium.org/8777003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/win')
| -rw-r--r-- | media/audio/win/audio_manager_win.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc index 80d0d9d..9d38588 100644 --- a/media/audio/win/audio_manager_win.cc +++ b/media/audio/win/audio_manager_win.cc @@ -18,7 +18,7 @@ #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" @@ -100,7 +100,7 @@ static string16 GetDeviceAndDriverInfo(HDEVINFO device_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 { @@ -141,7 +141,7 @@ AudioOutputStream* AudioManagerWin::MakeAudioOutputStream( 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); @@ -167,7 +167,7 @@ AudioInputStream* AudioManagerWin::MakeAudioInputStream( 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. @@ -272,7 +272,7 @@ bool AudioManagerWin::CanShowAudioInputSettings() { 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 { |