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

Side by Side Diff: modules/audio_device/ios/audio_device_ios.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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 int32_t MicrophoneMute(bool& enabled) const override; 132 int32_t MicrophoneMute(bool& enabled) const override;
133 int32_t SpeakerMuteIsAvailable(bool& available) override; 133 int32_t SpeakerMuteIsAvailable(bool& available) override;
134 int32_t SetSpeakerMute(bool enable) override; 134 int32_t SetSpeakerMute(bool enable) override;
135 int32_t SpeakerMute(bool& enabled) const override; 135 int32_t SpeakerMute(bool& enabled) const override;
136 int32_t StereoPlayoutIsAvailable(bool& available) override; 136 int32_t StereoPlayoutIsAvailable(bool& available) override;
137 int32_t SetStereoPlayout(bool enable) override; 137 int32_t SetStereoPlayout(bool enable) override;
138 int32_t StereoPlayout(bool& enabled) const override; 138 int32_t StereoPlayout(bool& enabled) const override;
139 int32_t StereoRecordingIsAvailable(bool& available) override; 139 int32_t StereoRecordingIsAvailable(bool& available) override;
140 int32_t SetStereoRecording(bool enable) override; 140 int32_t SetStereoRecording(bool enable) override;
141 int32_t StereoRecording(bool& enabled) const override; 141 int32_t StereoRecording(bool& enabled) const override;
142 bool PlayoutWarning() const override;
143 bool PlayoutError() const override;
144 bool RecordingWarning() const override;
145 bool RecordingError() const override;
146 void ClearPlayoutWarning() override {}
147 void ClearPlayoutError() override {}
148 void ClearRecordingWarning() override {}
149 void ClearRecordingError() override {}
150 142
151 // AudioSessionObserver methods. May be called from any thread. 143 // AudioSessionObserver methods. May be called from any thread.
152 void OnInterruptionBegin() override; 144 void OnInterruptionBegin() override;
153 void OnInterruptionEnd() override; 145 void OnInterruptionEnd() override;
154 void OnValidRouteChange() override; 146 void OnValidRouteChange() override;
155 void OnCanPlayOrRecordChange(bool can_play_or_record) override; 147 void OnCanPlayOrRecordChange(bool can_play_or_record) override;
156 void OnChangedOutputVolume() override; 148 void OnChangedOutputVolume() override;
157 149
158 // VoiceProcessingAudioUnitObserver methods. 150 // VoiceProcessingAudioUnitObserver methods.
159 OSStatus OnDeliverRecordedData(AudioUnitRenderActionFlags* flags, 151 OSStatus OnDeliverRecordedData(AudioUnitRenderActionFlags* flags,
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 // Contains the time for when the last output volume change was detected. 290 // Contains the time for when the last output volume change was detected.
299 int64_t last_output_volume_change_time_ RTC_ACCESS_ON(thread_checker_); 291 int64_t last_output_volume_change_time_ RTC_ACCESS_ON(thread_checker_);
300 292
301 // Exposes private members for testing purposes only. 293 // Exposes private members for testing purposes only.
302 FRIEND_TEST_ALL_PREFIXES(AudioDeviceTest, testInterruptedAudioSession); 294 FRIEND_TEST_ALL_PREFIXES(AudioDeviceTest, testInterruptedAudioSession);
303 }; 295 };
304 296
305 } // namespace webrtc 297 } // namespace webrtc
306 298
307 #endif // MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ 299 #endif // MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698