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

Side by Side Diff: webrtc/voice_engine/voe_hardware_impl.cc

Issue 2700983002: Remove the Windows Wave audio device implementation. (Closed)
Patch Set: Delete even more code and clean up _WIN32 usage Created 3 years, 10 months 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 unified diff | Download patch
« no previous file with comments | « webrtc/modules/audio_device/win/audio_device_wave_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // Map to AudioDeviceModule::AudioLayer 50 // Map to AudioDeviceModule::AudioLayer
51 AudioDeviceModule::AudioLayer wantedLayer( 51 AudioDeviceModule::AudioLayer wantedLayer(
52 AudioDeviceModule::kPlatformDefaultAudio); 52 AudioDeviceModule::kPlatformDefaultAudio);
53 switch (audioLayer) { 53 switch (audioLayer) {
54 case kAudioPlatformDefault: 54 case kAudioPlatformDefault:
55 // already set above 55 // already set above
56 break; 56 break;
57 case kAudioWindowsCore: 57 case kAudioWindowsCore:
58 wantedLayer = AudioDeviceModule::kWindowsCoreAudio; 58 wantedLayer = AudioDeviceModule::kWindowsCoreAudio;
59 break; 59 break;
60 case kAudioWindowsWave:
61 wantedLayer = AudioDeviceModule::kWindowsWaveAudio;
62 break;
63 case kAudioLinuxAlsa: 60 case kAudioLinuxAlsa:
64 wantedLayer = AudioDeviceModule::kLinuxAlsaAudio; 61 wantedLayer = AudioDeviceModule::kLinuxAlsaAudio;
65 break; 62 break;
66 case kAudioLinuxPulse: 63 case kAudioLinuxPulse:
67 wantedLayer = AudioDeviceModule::kLinuxPulseAudio; 64 wantedLayer = AudioDeviceModule::kLinuxPulseAudio;
68 break; 65 break;
69 } 66 }
70 67
71 // Save the audio device layer for Init() 68 // Save the audio device layer for Init()
72 _shared->set_audio_device_layer(wantedLayer); 69 _shared->set_audio_device_layer(wantedLayer);
(...skipping 20 matching lines...) Expand all
93 } 90 }
94 91
95 // Map to AudioLayers 92 // Map to AudioLayers
96 switch (activeLayer) { 93 switch (activeLayer) {
97 case AudioDeviceModule::kPlatformDefaultAudio: 94 case AudioDeviceModule::kPlatformDefaultAudio:
98 audioLayer = kAudioPlatformDefault; 95 audioLayer = kAudioPlatformDefault;
99 break; 96 break;
100 case AudioDeviceModule::kWindowsCoreAudio: 97 case AudioDeviceModule::kWindowsCoreAudio:
101 audioLayer = kAudioWindowsCore; 98 audioLayer = kAudioWindowsCore;
102 break; 99 break;
103 case AudioDeviceModule::kWindowsWaveAudio:
104 audioLayer = kAudioWindowsWave;
105 break;
106 case AudioDeviceModule::kLinuxAlsaAudio: 100 case AudioDeviceModule::kLinuxAlsaAudio:
107 audioLayer = kAudioLinuxAlsa; 101 audioLayer = kAudioLinuxAlsa;
108 break; 102 break;
109 case AudioDeviceModule::kLinuxPulseAudio: 103 case AudioDeviceModule::kLinuxPulseAudio:
110 audioLayer = kAudioLinuxPulse; 104 audioLayer = kAudioLinuxPulse;
111 break; 105 break;
112 default: 106 default:
113 _shared->SetLastError(VE_UNDEFINED_SC_ERR, kTraceError, 107 _shared->SetLastError(VE_UNDEFINED_SC_ERR, kTraceError,
114 " unknown audio layer"); 108 " unknown audio layer");
115 } 109 }
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 493
500 int VoEHardwareImpl::EnableBuiltInNS(bool enable) { 494 int VoEHardwareImpl::EnableBuiltInNS(bool enable) {
501 if (!_shared->statistics().Initialized()) { 495 if (!_shared->statistics().Initialized()) {
502 _shared->SetLastError(VE_NOT_INITED, kTraceError); 496 _shared->SetLastError(VE_NOT_INITED, kTraceError);
503 return -1; 497 return -1;
504 } 498 }
505 return _shared->audio_device()->EnableBuiltInNS(enable); 499 return _shared->audio_device()->EnableBuiltInNS(enable);
506 } 500 }
507 501
508 } // namespace webrtc 502 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/win/audio_device_wave_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698