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

Side by Side Diff: webrtc/modules/audio_device/linux/audio_device_pulse_linux.h

Issue 1476453002: Clean up PlatformThread. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: IsRunning DCHECK Created 5 years 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
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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 bool PlayThreadProcess(); 277 bool PlayThreadProcess();
278 278
279 AudioDeviceBuffer* _ptrAudioBuffer; 279 AudioDeviceBuffer* _ptrAudioBuffer;
280 280
281 CriticalSectionWrapper& _critSect; 281 CriticalSectionWrapper& _critSect;
282 EventWrapper& _timeEventRec; 282 EventWrapper& _timeEventRec;
283 EventWrapper& _timeEventPlay; 283 EventWrapper& _timeEventPlay;
284 EventWrapper& _recStartEvent; 284 EventWrapper& _recStartEvent;
285 EventWrapper& _playStartEvent; 285 EventWrapper& _playStartEvent;
286 286
287 rtc::scoped_ptr<PlatformThread> _ptrThreadPlay; 287 // TODO(pbos): Remove scoped_ptr and use directly without resetting.
288 rtc::scoped_ptr<PlatformThread> _ptrThreadRec; 288 rtc::scoped_ptr<rtc::PlatformThread> _ptrThreadPlay;
289 rtc::scoped_ptr<rtc::PlatformThread> _ptrThreadRec;
289 int32_t _id; 290 int32_t _id;
290 291
291 AudioMixerManagerLinuxPulse _mixerManager; 292 AudioMixerManagerLinuxPulse _mixerManager;
292 293
293 uint16_t _inputDeviceIndex; 294 uint16_t _inputDeviceIndex;
294 uint16_t _outputDeviceIndex; 295 uint16_t _outputDeviceIndex;
295 bool _inputDeviceIsSpecified; 296 bool _inputDeviceIsSpecified;
296 bool _outputDeviceIsSpecified; 297 bool _outputDeviceIsSpecified;
297 298
298 int sample_rate_hz_; 299 int sample_rate_hz_;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 pa_buffer_attr _playBufferAttr; 367 pa_buffer_attr _playBufferAttr;
367 pa_buffer_attr _recBufferAttr; 368 pa_buffer_attr _recBufferAttr;
368 369
369 char _oldKeyState[32]; 370 char _oldKeyState[32];
370 Display* _XDisplay; 371 Display* _XDisplay;
371 }; 372 };
372 373
373 } 374 }
374 375
375 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_PULSE_LINUX_H_ 376 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_PULSE_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698