OLD | NEW |
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 |
11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H | 11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H |
12 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H | 12 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H |
13 | 13 |
| 14 #include <memory> |
| 15 |
14 #include "webrtc/base/platform_thread.h" | 16 #include "webrtc/base/platform_thread.h" |
15 #include "webrtc/modules/audio_device/audio_device_generic.h" | 17 #include "webrtc/modules/audio_device/audio_device_generic.h" |
16 #include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h" | 18 #include "webrtc/modules/audio_device/win/audio_mixer_manager_win.h" |
17 | 19 |
18 #pragma comment( lib, "winmm.lib" ) | 20 #pragma comment( lib, "winmm.lib" ) |
19 | 21 |
20 namespace webrtc { | 22 namespace webrtc { |
21 class EventTimerWrapper; | 23 class EventTimerWrapper; |
22 class EventWrapper; | 24 class EventWrapper; |
23 | 25 |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 EventTimerWrapper& _timeEvent; | 217 EventTimerWrapper& _timeEvent; |
216 EventWrapper& _recStartEvent; | 218 EventWrapper& _recStartEvent; |
217 EventWrapper& _playStartEvent; | 219 EventWrapper& _playStartEvent; |
218 | 220 |
219 HANDLE _hGetCaptureVolumeThread; | 221 HANDLE _hGetCaptureVolumeThread; |
220 HANDLE _hShutdownGetVolumeEvent; | 222 HANDLE _hShutdownGetVolumeEvent; |
221 HANDLE _hSetCaptureVolumeThread; | 223 HANDLE _hSetCaptureVolumeThread; |
222 HANDLE _hShutdownSetVolumeEvent; | 224 HANDLE _hShutdownSetVolumeEvent; |
223 HANDLE _hSetCaptureVolumeEvent; | 225 HANDLE _hSetCaptureVolumeEvent; |
224 | 226 |
225 // TODO(pbos): Remove scoped_ptr usage and use PlatformThread directly | 227 // TODO(pbos): Remove unique_ptr usage and use PlatformThread directly |
226 rtc::scoped_ptr<rtc::PlatformThread> _ptrThread; | 228 std::unique_ptr<rtc::PlatformThread> _ptrThread; |
227 | 229 |
228 CriticalSectionWrapper& _critSectCb; | 230 CriticalSectionWrapper& _critSectCb; |
229 | 231 |
230 int32_t _id; | 232 int32_t _id; |
231 | 233 |
232 AudioMixerManager _mixerManager; | 234 AudioMixerManager _mixerManager; |
233 | 235 |
234 bool _usingInputDeviceIndex; | 236 bool _usingInputDeviceIndex; |
235 bool _usingOutputDeviceIndex; | 237 bool _usingOutputDeviceIndex; |
236 AudioDeviceModule::WindowsDeviceType _inputDevice; | 238 AudioDeviceModule::WindowsDeviceType _inputDevice; |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 uint16_t _recError; | 334 uint16_t _recError; |
333 | 335 |
334 uint32_t _newMicLevel; | 336 uint32_t _newMicLevel; |
335 uint32_t _minMicVolume; | 337 uint32_t _minMicVolume; |
336 uint32_t _maxMicVolume; | 338 uint32_t _maxMicVolume; |
337 }; | 339 }; |
338 | 340 |
339 } // namespace webrtc | 341 } // namespace webrtc |
340 | 342 |
341 #endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H | 343 #endif // WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_WAVE_WIN_H |
OLD | NEW |