diff options
Diffstat (limited to 'webrtc/modules/audio_device/linux/audio_device_pulse_linux.h')
| -rw-r--r-- | webrtc/modules/audio_device/linux/audio_device_pulse_linux.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h index 718331188d..de8df0be1b 100644 --- a/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h +++ b/webrtc/modules/audio_device/linux/audio_device_pulse_linux.h @@ -11,11 +11,11 @@ #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_PULSE_LINUX_H +#include "webrtc/base/platform_thread.h" +#include "webrtc/base/thread_checker.h" #include "webrtc/modules/audio_device/audio_device_generic.h" #include "webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" -#include "webrtc/system_wrappers/include/thread_wrapper.h" -#include "webrtc/base/thread_checker.h" #include <X11/Xlib.h> #include <pulse/pulseaudio.h> @@ -284,8 +284,9 @@ private: EventWrapper& _recStartEvent; EventWrapper& _playStartEvent; - rtc::scoped_ptr<ThreadWrapper> _ptrThreadPlay; - rtc::scoped_ptr<ThreadWrapper> _ptrThreadRec; + // TODO(pbos): Remove scoped_ptr and use directly without resetting. + rtc::scoped_ptr<rtc::PlatformThread> _ptrThreadPlay; + rtc::scoped_ptr<rtc::PlatformThread> _ptrThreadRec; int32_t _id; AudioMixerManagerLinuxPulse _mixerManager; |