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_PULSE_LINUX_H | 11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H |
12 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H | 12 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H |
13 | 13 |
| 14 #include <memory> |
| 15 |
14 #include "webrtc/base/platform_thread.h" | 16 #include "webrtc/base/platform_thread.h" |
15 #include "webrtc/base/thread_checker.h" | 17 #include "webrtc/base/thread_checker.h" |
16 #include "webrtc/modules/audio_device/audio_device_generic.h" | 18 #include "webrtc/modules/audio_device/audio_device_generic.h" |
17 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" | 19 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" |
18 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" | 20 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
19 | 21 |
20 #include <X11/Xlib.h> | 22 #include <X11/Xlib.h> |
21 #include <pulse/pulseaudio.h> | 23 #include <pulse/pulseaudio.h> |
22 | 24 |
23 // We define this flag if it's missing from our headers, because we want to be | 25 // We define this flag if it's missing from our headers, because we want to be |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 bool PlayThreadProcess(); | 279 bool PlayThreadProcess(); |
278 | 280 |
279 AudioDeviceBuffer* _ptrAudioBuffer; | 281 AudioDeviceBuffer* _ptrAudioBuffer; |
280 | 282 |
281 CriticalSectionWrapper& _critSect; | 283 CriticalSectionWrapper& _critSect; |
282 EventWrapper& _timeEventRec; | 284 EventWrapper& _timeEventRec; |
283 EventWrapper& _timeEventPlay; | 285 EventWrapper& _timeEventPlay; |
284 EventWrapper& _recStartEvent; | 286 EventWrapper& _recStartEvent; |
285 EventWrapper& _playStartEvent; | 287 EventWrapper& _playStartEvent; |
286 | 288 |
287 // TODO(pbos): Remove scoped_ptr and use directly without resetting. | 289 // TODO(pbos): Remove unique_ptr and use directly without resetting. |
288 rtc::scoped_ptr<rtc::PlatformThread> _ptrThreadPlay; | 290 std::unique_ptr<rtc::PlatformThread> _ptrThreadPlay; |
289 rtc::scoped_ptr<rtc::PlatformThread> _ptrThreadRec; | 291 std::unique_ptr<rtc::PlatformThread> _ptrThreadRec; |
290 int32_t _id; | 292 int32_t _id; |
291 | 293 |
292 AudioMixerManagerLinuxPulse _mixerManager; | 294 AudioMixerManagerLinuxPulse _mixerManager; |
293 | 295 |
294 uint16_t _inputDeviceIndex; | 296 uint16_t _inputDeviceIndex; |
295 uint16_t _outputDeviceIndex; | 297 uint16_t _outputDeviceIndex; |
296 bool _inputDeviceIsSpecified; | 298 bool _inputDeviceIsSpecified; |
297 bool _outputDeviceIsSpecified; | 299 bool _outputDeviceIsSpecified; |
298 | 300 |
299 int sample_rate_hz_; | 301 int sample_rate_hz_; |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 pa_buffer_attr _playBufferAttr; | 369 pa_buffer_attr _playBufferAttr; |
368 pa_buffer_attr _recBufferAttr; | 370 pa_buffer_attr _recBufferAttr; |
369 | 371 |
370 char _oldKeyState[32]; | 372 char _oldKeyState[32]; |
371 Display* _XDisplay; | 373 Display* _XDisplay; |
372 }; | 374 }; |
373 | 375 |
374 } | 376 } |
375 | 377 |
376 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_PULSE_LINUX_H_ | 378 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_PULSE_LINUX_H_ |
OLD | NEW |