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

Unified Diff: webrtc/modules/audio_device/ios/audio_device_ios.h

Issue 2349263004: Ensures that ADM for Android and iOS uses identical states when stopping audio (Closed)
Patch Set: Changes based on tests py sophiechang@ Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/modules/audio_device/ios/audio_device_ios.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_device/ios/audio_device_ios.h
diff --git a/webrtc/modules/audio_device/ios/audio_device_ios.h b/webrtc/modules/audio_device/ios/audio_device_ios.h
index efe2558127664b7acf20a5479e6f02337573ef1a..5aa3b70e687d5022bc79a5338b61be001482821e 100644
--- a/webrtc/modules/audio_device/ios/audio_device_ios.h
+++ b/webrtc/modules/audio_device/ios/audio_device_ios.h
@@ -54,10 +54,10 @@ class AudioDeviceIOS : public AudioDeviceGeneric,
bool Initialized() const override { return initialized_; }
int32_t InitPlayout() override;
- bool PlayoutIsInitialized() const override { return play_is_initialized_; }
+ bool PlayoutIsInitialized() const override { return audio_is_initialized_; }
int32_t InitRecording() override;
- bool RecordingIsInitialized() const override { return rec_is_initialized_; }
+ bool RecordingIsInitialized() const override { return audio_is_initialized_; }
int32_t StartPlayout() override;
int32_t StopPlayout() override;
@@ -280,11 +280,9 @@ class AudioDeviceIOS : public AudioDeviceGeneric,
// Set to true after successful call to Init(), false otherwise.
bool initialized_;
- // Set to true after successful call to InitRecording(), false otherwise.
- bool rec_is_initialized_;
-
- // Set to true after successful call to InitPlayout(), false otherwise.
- bool play_is_initialized_;
+ // Set to true after successful call to InitRecording() or InitPlayout(),
+ // false otherwise.
+ bool audio_is_initialized_;
// Set to true if audio session is interrupted, false otherwise.
bool is_interrupted_;
« no previous file with comments | « no previous file | webrtc/modules/audio_device/ios/audio_device_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698