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

Side by Side Diff: modules/audio_device/win/audio_device_core_win.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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 virtual int32_t SetStereoRecording(bool enable); 171 virtual int32_t SetStereoRecording(bool enable);
172 virtual int32_t StereoRecording(bool& enabled) const; 172 virtual int32_t StereoRecording(bool& enabled) const;
173 173
174 // Delay information and control 174 // Delay information and control
175 virtual int32_t PlayoutDelay(uint16_t& delayMS) const; 175 virtual int32_t PlayoutDelay(uint16_t& delayMS) const;
176 virtual int32_t RecordingDelay(uint16_t& delayMS) const; 176 virtual int32_t RecordingDelay(uint16_t& delayMS) const;
177 177
178 virtual int32_t EnableBuiltInAEC(bool enable); 178 virtual int32_t EnableBuiltInAEC(bool enable);
179 179
180 public: 180 public:
181 virtual bool PlayoutWarning() const;
182 virtual bool PlayoutError() const;
183 virtual bool RecordingWarning() const;
184 virtual bool RecordingError() const;
185 virtual void ClearPlayoutWarning();
186 virtual void ClearPlayoutError();
187 virtual void ClearRecordingWarning();
188 virtual void ClearRecordingError();
189
190 public:
191 virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer); 181 virtual void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer);
192 182
193 private: 183 private:
194 bool KeyPressed() const; 184 bool KeyPressed() const;
195 185
196 private: // avrt function pointers 186 private: // avrt function pointers
197 PAvRevertMmThreadCharacteristics _PAvRevertMmThreadCharacteristics; 187 PAvRevertMmThreadCharacteristics _PAvRevertMmThreadCharacteristics;
198 PAvSetMmThreadCharacteristicsA _PAvSetMmThreadCharacteristicsA; 188 PAvSetMmThreadCharacteristicsA _PAvSetMmThreadCharacteristicsA;
199 PAvSetMmThreadPriority _PAvSetMmThreadPriority; 189 PAvSetMmThreadPriority _PAvSetMmThreadPriority;
200 HMODULE _avrtLibrary; 190 HMODULE _avrtLibrary;
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 315
326 bool _usingInputDeviceIndex; 316 bool _usingInputDeviceIndex;
327 bool _usingOutputDeviceIndex; 317 bool _usingOutputDeviceIndex;
328 AudioDeviceModule::WindowsDeviceType _inputDevice; 318 AudioDeviceModule::WindowsDeviceType _inputDevice;
329 AudioDeviceModule::WindowsDeviceType _outputDevice; 319 AudioDeviceModule::WindowsDeviceType _outputDevice;
330 uint16_t _inputDeviceIndex; 320 uint16_t _inputDeviceIndex;
331 uint16_t _outputDeviceIndex; 321 uint16_t _outputDeviceIndex;
332 322
333 bool _AGC; 323 bool _AGC;
334 324
335 uint16_t _playWarning;
336 uint16_t _playError;
337 uint16_t _recWarning;
338 uint16_t _recError;
339
340 uint16_t _playBufDelay; 325 uint16_t _playBufDelay;
341 326
342 uint16_t _newMicLevel; 327 uint16_t _newMicLevel;
343 328
344 mutable char _str[512]; 329 mutable char _str[512];
345 }; 330 };
346 331
347 #endif // #if (_MSC_VER >= 1400) 332 #endif // #if (_MSC_VER >= 1400)
348 333
349 } // namespace webrtc 334 } // namespace webrtc
350 335
351 #endif // AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_ 336 #endif // AUDIO_DEVICE_AUDIO_DEVICE_CORE_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698