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

Side by Side Diff: modules/audio_device/linux/audio_device_alsa_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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 int32_t SetStereoPlayout(bool enable) override; 118 int32_t SetStereoPlayout(bool enable) override;
119 int32_t StereoPlayout(bool& enabled) const override; 119 int32_t StereoPlayout(bool& enabled) const override;
120 int32_t StereoRecordingIsAvailable(bool& available) override; 120 int32_t StereoRecordingIsAvailable(bool& available) override;
121 int32_t SetStereoRecording(bool enable) override; 121 int32_t SetStereoRecording(bool enable) override;
122 int32_t StereoRecording(bool& enabled) const override; 122 int32_t StereoRecording(bool& enabled) const override;
123 123
124 // Delay information and control 124 // Delay information and control
125 int32_t PlayoutDelay(uint16_t& delayMS) const override; 125 int32_t PlayoutDelay(uint16_t& delayMS) const override;
126 int32_t RecordingDelay(uint16_t& delayMS) const override; 126 int32_t RecordingDelay(uint16_t& delayMS) const override;
127 127
128 bool PlayoutWarning() const override;
129 bool PlayoutError() const override;
130 bool RecordingWarning() const override;
131 bool RecordingError() const override;
132 void ClearPlayoutWarning() override;
133 void ClearPlayoutError() override;
134 void ClearRecordingWarning() override;
135 void ClearRecordingError() override;
136
137 void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override; 128 void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override;
138 129
139 private: 130 private:
140 int32_t GetDevicesInfo(const int32_t function, 131 int32_t GetDevicesInfo(const int32_t function,
141 const bool playback, 132 const bool playback,
142 const int32_t enumDeviceNo = 0, 133 const int32_t enumDeviceNo = 0,
143 char* enumDeviceName = NULL, 134 char* enumDeviceName = NULL,
144 const int32_t ednLen = 0) const; 135 const int32_t ednLen = 0) const;
145 int32_t ErrorRecovery(int32_t error, snd_pcm_t* deviceHandle); 136 int32_t ErrorRecovery(int32_t error, snd_pcm_t* deviceHandle);
146 137
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 bool _initialized; 190 bool _initialized;
200 bool _recording; 191 bool _recording;
201 bool _playing; 192 bool _playing;
202 bool _recIsInitialized; 193 bool _recIsInitialized;
203 bool _playIsInitialized; 194 bool _playIsInitialized;
204 bool _AGC; 195 bool _AGC;
205 196
206 snd_pcm_sframes_t _recordingDelay; 197 snd_pcm_sframes_t _recordingDelay;
207 snd_pcm_sframes_t _playoutDelay; 198 snd_pcm_sframes_t _playoutDelay;
208 199
209 uint16_t _playWarning;
210 uint16_t _playError;
211 uint16_t _recWarning;
212 uint16_t _recError;
213
214 char _oldKeyState[32]; 200 char _oldKeyState[32];
215 #if defined(USE_X11) 201 #if defined(USE_X11)
216 Display* _XDisplay; 202 Display* _XDisplay;
217 #endif 203 #endif
218 }; 204 };
219 205
220 } 206 }
221 207
222 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_ALSA_LINUX_H_ 208 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_ALSA_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698