| Index: media/audio/win/audio_manager_win.cc
|
| diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc
|
| index 3999ae44fdc7031e8c09692af539af9212baf6c2..3478a21e46c5c2143a479af6f747a23c6a930906 100644
|
| --- a/media/audio/win/audio_manager_win.cc
|
| +++ b/media/audio/win/audio_manager_win.cc
|
| @@ -26,7 +26,6 @@
|
| #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/audio_unified_win.h"
|
| #include "media/audio/win/core_audio_util_win.h"
|
| #include "media/audio/win/device_enumeration_win.h"
|
| #include "media/audio/win/wavein_input_win.h"
|
| @@ -343,8 +342,7 @@ AudioOutputStream* AudioManagerWin::MakeLinearOutputStream(
|
| // - WASAPIAudioOutputStream: Based on Core Audio (WASAPI) API.
|
| AudioOutputStream* AudioManagerWin::MakeLowLatencyOutputStream(
|
| const AudioParameters& params,
|
| - const std::string& device_id,
|
| - const std::string& input_device_id) {
|
| + const std::string& device_id) {
|
| DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
|
| if (params.channels() > kWinMaxChannels)
|
| return NULL;
|
| @@ -359,15 +357,6 @@ AudioOutputStream* AudioManagerWin::MakeLowLatencyOutputStream(
|
| this, params, NumberOfWaveOutBuffers(), WAVE_MAPPER);
|
| }
|
|
|
| - // TODO(rtoy): support more than stereo input.
|
| - if (params.input_channels() > 0) {
|
| - DVLOG(1) << "WASAPIUnifiedStream is created.";
|
| - DLOG_IF(ERROR, !device_id.empty() &&
|
| - device_id != AudioManagerBase::kDefaultDeviceId)
|
| - << "Opening by device id not supported by WASAPIUnifiedStream";
|
| - return new WASAPIUnifiedStream(this, params, input_device_id);
|
| - }
|
| -
|
| // Pass an empty string to indicate that we want the default device
|
| // since we consistently only check for an empty string in
|
| // WASAPIAudioOutputStream.
|
|
|