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

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

Issue 2978953003: Replace WEBRTC_TRACE logging in audio_device_alsa_linux.cc (Closed)
Patch Set: manual fixes Created 3 years, 5 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 | « no previous file | webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc » ('j') | 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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 179
180 AudioDeviceBuffer* _ptrAudioBuffer; 180 AudioDeviceBuffer* _ptrAudioBuffer;
181 181
182 rtc::CriticalSection _critSect; 182 rtc::CriticalSection _critSect;
183 183
184 // TODO(pbos): Make plain members and start/stop instead of resetting these 184 // TODO(pbos): Make plain members and start/stop instead of resetting these
185 // pointers. A thread can be reused. 185 // pointers. A thread can be reused.
186 std::unique_ptr<rtc::PlatformThread> _ptrThreadRec; 186 std::unique_ptr<rtc::PlatformThread> _ptrThreadRec;
187 std::unique_ptr<rtc::PlatformThread> _ptrThreadPlay; 187 std::unique_ptr<rtc::PlatformThread> _ptrThreadPlay;
188 188
189 int32_t _id;
190
191 AudioMixerManagerLinuxALSA _mixerManager; 189 AudioMixerManagerLinuxALSA _mixerManager;
192 190
193 uint16_t _inputDeviceIndex; 191 uint16_t _inputDeviceIndex;
194 uint16_t _outputDeviceIndex; 192 uint16_t _outputDeviceIndex;
195 bool _inputDeviceIsSpecified; 193 bool _inputDeviceIsSpecified;
196 bool _outputDeviceIsSpecified; 194 bool _outputDeviceIsSpecified;
197 195
198 snd_pcm_t* _handleRecord; 196 snd_pcm_t* _handleRecord;
199 snd_pcm_t* _handlePlayout; 197 snd_pcm_t* _handlePlayout;
200 198
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 238
241 char _oldKeyState[32]; 239 char _oldKeyState[32];
242 #if defined(USE_X11) 240 #if defined(USE_X11)
243 Display* _XDisplay; 241 Display* _XDisplay;
244 #endif 242 #endif
245 }; 243 };
246 244
247 } 245 }
248 246
249 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_ALSA_LINUX_H_ 247 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_ALSA_LINUX_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_device/linux/audio_device_alsa_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698