Chromium Code Reviews| Index: webrtc/modules/audio_device/audio_device_impl.cc |
| diff --git a/webrtc/modules/audio_device/audio_device_impl.cc b/webrtc/modules/audio_device/audio_device_impl.cc |
| index ad643e9684688a5ae9cf641364bdd3425f31a817..9a0891c978db4644b2b12db72f76c744e9a87869 100644 |
| --- a/webrtc/modules/audio_device/audio_device_impl.cc |
| +++ b/webrtc/modules/audio_device/audio_device_impl.cc |
| @@ -23,7 +23,6 @@ |
| #include <string.h> |
| #if defined(_WIN32) |
| -#include "audio_device_wave_win.h" |
| #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) |
| #include "audio_device_core_win.h" |
| #endif |
| @@ -201,16 +200,6 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() { |
| // Create the *Windows* implementation of the Audio Device |
| // |
| #if defined(_WIN32) |
|
the sun
2017/02/17 18:41:55
Can we remove the _WIN32 conditional?
tommi
2017/02/17 21:44:22
Done.
|
| - if ((audioLayer == kWindowsWaveAudio) |
| -#if !defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) |
| - // Wave audio is default if Core audio is not supported in this build |
| - || (audioLayer == kPlatformDefaultAudio) |
| -#endif |
| - ) { |
| - // create *Windows Wave Audio* implementation |
| - ptrAudioDevice = new AudioDeviceWindowsWave(Id()); |
| - LOG(INFO) << "Windows Wave APIs will be utilized"; |
| - } |
| #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) |
| if ((audioLayer == kWindowsCoreAudio) || |
| (audioLayer == kPlatformDefaultAudio)) { |
| @@ -220,16 +209,6 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() { |
| // create *Windows Core Audio* implementation |
| ptrAudioDevice = new AudioDeviceWindowsCore(Id()); |
| LOG(INFO) << "Windows Core Audio APIs will be utilized"; |
| - } else { |
| - // create *Windows Wave Audio* implementation |
| - ptrAudioDevice = new AudioDeviceWindowsWave(Id()); |
| - if (ptrAudioDevice != NULL) { |
| - // Core Audio was not supported => revert to Windows Wave instead |
| - _platformAudioLayer = |
| - kWindowsWaveAudio; // modify the state set at construction |
| - LOG(WARNING) << "Windows Core Audio is *not* supported => Wave APIs " |
| - "will be utilized instead"; |
| - } |
| } |
| } |
| #endif // defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) |