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

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

Issue 3020493002: Remove AudioDeviceObserver and make ADM not inherit from the Module interface.
Patch Set: linux build error Created 3 years, 2 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
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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 int32_t SetStereoPlayout(bool enable) override; 180 int32_t SetStereoPlayout(bool enable) override;
181 int32_t StereoPlayout(bool& enabled) const override; 181 int32_t StereoPlayout(bool& enabled) const override;
182 int32_t StereoRecordingIsAvailable(bool& available) override; 182 int32_t StereoRecordingIsAvailable(bool& available) override;
183 int32_t SetStereoRecording(bool enable) override; 183 int32_t SetStereoRecording(bool enable) override;
184 int32_t StereoRecording(bool& enabled) const override; 184 int32_t StereoRecording(bool& enabled) const override;
185 185
186 // Delay information and control 186 // Delay information and control
187 int32_t PlayoutDelay(uint16_t& delayMS) const override; 187 int32_t PlayoutDelay(uint16_t& delayMS) const override;
188 int32_t RecordingDelay(uint16_t& delayMS) const override; 188 int32_t RecordingDelay(uint16_t& delayMS) const override;
189 189
190 bool PlayoutWarning() const override;
191 bool PlayoutError() const override;
192 bool RecordingWarning() const override;
193 bool RecordingError() const override;
194 void ClearPlayoutWarning() override;
195 void ClearPlayoutError() override;
196 void ClearRecordingWarning() override;
197 void ClearRecordingError() override;
198
199 void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override; 190 void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override;
200 191
201 private: 192 private:
202 void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION(_critSect) { _critSect.Enter(); } 193 void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION(_critSect) { _critSect.Enter(); }
203 void UnLock() RTC_UNLOCK_FUNCTION(_critSect) { _critSect.Leave(); } 194 void UnLock() RTC_UNLOCK_FUNCTION(_critSect) { _critSect.Leave(); }
204 void WaitForOperationCompletion(pa_operation* paOperation) const; 195 void WaitForOperationCompletion(pa_operation* paOperation) const;
205 void WaitForSuccess(pa_operation* paOperation) const; 196 void WaitForSuccess(pa_operation* paOperation) const;
206 197
207 bool KeyPressed() const; 198 bool KeyPressed() const;
208 199
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 bool _stopRec; 290 bool _stopRec;
300 bool _startPlay; 291 bool _startPlay;
301 bool _stopPlay; 292 bool _stopPlay;
302 bool _AGC; 293 bool _AGC;
303 bool update_speaker_volume_at_startup_; 294 bool update_speaker_volume_at_startup_;
304 295
305 uint32_t _sndCardPlayDelay; 296 uint32_t _sndCardPlayDelay;
306 uint32_t _sndCardRecDelay; 297 uint32_t _sndCardRecDelay;
307 298
308 int32_t _writeErrors; 299 int32_t _writeErrors;
309 uint16_t _playWarning;
310 uint16_t _playError;
311 uint16_t _recWarning;
312 uint16_t _recError;
313 300
314 uint16_t _deviceIndex; 301 uint16_t _deviceIndex;
315 int16_t _numPlayDevices; 302 int16_t _numPlayDevices;
316 int16_t _numRecDevices; 303 int16_t _numRecDevices;
317 char* _playDeviceName; 304 char* _playDeviceName;
318 char* _recDeviceName; 305 char* _recDeviceName;
319 char* _playDisplayDeviceName; 306 char* _playDisplayDeviceName;
320 char* _recDisplayDeviceName; 307 char* _recDisplayDeviceName;
321 char _paServerVersion[32]; 308 char _paServerVersion[32];
322 309
(...skipping 24 matching lines...) Expand all
347 pa_buffer_attr _playBufferAttr; 334 pa_buffer_attr _playBufferAttr;
348 pa_buffer_attr _recBufferAttr; 335 pa_buffer_attr _recBufferAttr;
349 336
350 char _oldKeyState[32]; 337 char _oldKeyState[32];
351 Display* _XDisplay; 338 Display* _XDisplay;
352 }; 339 };
353 340
354 } 341 }
355 342
356 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_PULSE_LINUX_H_ 343 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_PULSE_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698