Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: media/audio/win/audio_manager_win.cc

Issue 8770005: Adds input device selection on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebased Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/win/audio_low_latency_input_win.cc ('k') | media/audio/win/wavein_input_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/win/audio_manager_win.cc
===================================================================
--- media/audio/win/audio_manager_win.cc (revision 112860)
+++ media/audio/win/audio_manager_win.cc (working copy)
@@ -165,21 +165,15 @@
return FakeAudioInputStream::MakeFakeStream(params);
} else if (params.format == AudioParameters::AUDIO_PCM_LINEAR) {
return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
- WAVE_MAPPER);
+ AudioManagerBase::kDefaultDeviceId);
} else if (params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
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);
+ return new PCMWaveInAudioInputStream(this, params, kNumInputBuffers,
+ device_id);
} 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.
- if (device_id == AudioManagerBase::kDefaultDeviceId)
- return new WASAPIAudioInputStream(this, params, eConsole);
+ return new WASAPIAudioInputStream(this, params, device_id);
}
}
return NULL;
« no previous file with comments | « media/audio/win/audio_low_latency_input_win.cc ('k') | media/audio/win/wavein_input_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698