| 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 7cccc16b59f8b4f8f1197f4268b15de5d05a5075..5c15c7f05d5a74da217851c3caeeeaab02367bd1 100644
|
| --- a/webrtc/modules/audio_device/ios/audio_device_ios.h
|
| +++ b/webrtc/modules/audio_device/ios/audio_device_ios.h
|
| @@ -269,7 +269,7 @@ class AudioDeviceIOS : public AudioDeviceGeneric,
|
| volatile int playing_;
|
|
|
| // Set to true after successful call to Init(), false otherwise.
|
| - bool initialized_ ACCESS_ON(thread_checker_);
|
| + bool initialized_ RTC_ACCESS_ON(thread_checker_);
|
|
|
| // Set to true after successful call to InitRecording() or InitPlayout(),
|
| // false otherwise.
|
| @@ -280,14 +280,14 @@ class AudioDeviceIOS : public AudioDeviceGeneric,
|
|
|
| // Audio interruption observer instance.
|
| RTCAudioSessionDelegateAdapter* audio_session_observer_
|
| - ACCESS_ON(thread_checker_);
|
| + RTC_ACCESS_ON(thread_checker_);
|
|
|
| // Set to true if we've activated the audio session.
|
| - bool has_configured_session_ ACCESS_ON(thread_checker_);
|
| + bool has_configured_session_ RTC_ACCESS_ON(thread_checker_);
|
|
|
| // Counts number of detected audio glitches on the playout side.
|
| - int64_t num_detected_playout_glitches_ ACCESS_ON(thread_checker_);
|
| - int64_t last_playout_time_ ACCESS_ON(io_thread_checker_);
|
| + int64_t num_detected_playout_glitches_ RTC_ACCESS_ON(thread_checker_);
|
| + int64_t last_playout_time_ RTC_ACCESS_ON(io_thread_checker_);
|
|
|
| // Counts number of playout callbacks per call.
|
| // The value isupdated on the native I/O thread and later read on the
|
| @@ -296,7 +296,7 @@ class AudioDeviceIOS : public AudioDeviceGeneric,
|
| int64_t num_playout_callbacks_;
|
|
|
| // Contains the time for when the last output volume change was detected.
|
| - int64_t last_output_volume_change_time_ ACCESS_ON(thread_checker_);
|
| + int64_t last_output_volume_change_time_ RTC_ACCESS_ON(thread_checker_);
|
|
|
| // Exposes private members for testing purposes only.
|
| FRIEND_TEST_ALL_PREFIXES(AudioDeviceTest, testInterruptedAudioSession);
|
|
|