From 1634e160426df926e14cf9f1e5346d2a1dc9c909 Mon Sep 17 00:00:00 2001 From: kthelgason Date: Tue, 7 Feb 2017 02:48:55 -0800 Subject: [PATCH] Remove use of selectors matching Apple private API names. This was causing some apps that include WebRTC to be rejected from the app store. BUG=webrtc:6382 Review-Url: https://codereview.webrtc.org/2679913002 Cr-Commit-Position: refs/heads/master@{#16462} --- webrtc/modules/audio_device/ios/objc/RTCAudioSession.h | 4 ++-- webrtc/modules/audio_device/ios/objc/RTCAudioSession.mm | 8 ++++---- .../ios/objc/RTCAudioSessionDelegateAdapter.mm | 4 ++-- .../modules/audio_device/ios/objc/RTCAudioSessionTest.mm | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/webrtc/modules/audio_device/ios/objc/RTCAudioSession.h b/webrtc/modules/audio_device/ios/objc/RTCAudioSession.h index ef5cec4600..199fd17b28 100644 --- a/webrtc/modules/audio_device/ios/objc/RTCAudioSession.h +++ b/webrtc/modules/audio_device/ios/objc/RTCAudioSession.h @@ -52,12 +52,12 @@ RTC_EXPORT /** Called on a system notification thread when AVAudioSession media server * terminates. */ -- (void)audioSessionMediaServicesWereLost:(RTCAudioSession *)session; +- (void)audioSessionMediaServerTerminated:(RTCAudioSession *)session; /** Called on a system notification thread when AVAudioSession media server * restarts. */ -- (void)audioSessionMediaServicesWereReset:(RTCAudioSession *)session; +- (void)audioSessionMediaServerReset:(RTCAudioSession *)session; // TODO(tkchin): Maybe handle SilenceSecondaryAudioHintNotification. diff --git a/webrtc/modules/audio_device/ios/objc/RTCAudioSession.mm b/webrtc/modules/audio_device/ios/objc/RTCAudioSession.mm index f6901844b5..4d9b977440 100644 --- a/webrtc/modules/audio_device/ios/objc/RTCAudioSession.mm +++ b/webrtc/modules/audio_device/ios/objc/RTCAudioSession.mm @@ -810,18 +810,18 @@ NSInteger const kRTCAudioSessionErrorConfiguration = -2; - (void)notifyMediaServicesWereLost { for (auto delegate : self.delegates) { - SEL sel = @selector(audioSessionMediaServicesWereLost:); + SEL sel = @selector(audioSessionMediaServerTerminated:); if ([delegate respondsToSelector:sel]) { - [delegate audioSessionMediaServicesWereLost:self]; + [delegate audioSessionMediaServerTerminated:self]; } } } - (void)notifyMediaServicesWereReset { for (auto delegate : self.delegates) { - SEL sel = @selector(audioSessionMediaServicesWereReset:); + SEL sel = @selector(audioSessionMediaServerReset:); if ([delegate respondsToSelector:sel]) { - [delegate audioSessionMediaServicesWereReset:self]; + [delegate audioSessionMediaServerReset:self]; } } } diff --git a/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm b/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm index b554e51ece..ee142d7371 100644 --- a/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm +++ b/webrtc/modules/audio_device/ios/objc/RTCAudioSessionDelegateAdapter.mm @@ -64,10 +64,10 @@ } } -- (void)audioSessionMediaServicesWereLost:(RTCAudioSession *)session { +- (void)audioSessionMediaServerTerminated:(RTCAudioSession *)session { } -- (void)audioSessionMediaServicesWereReset:(RTCAudioSession *)session { +- (void)audioSessionMediaServerReset:(RTCAudioSession *)session { } - (void)audioSession:(RTCAudioSession *)session diff --git a/webrtc/modules/audio_device/ios/objc/RTCAudioSessionTest.mm b/webrtc/modules/audio_device/ios/objc/RTCAudioSessionTest.mm index 93a1e903d9..cb87910fee 100644 --- a/webrtc/modules/audio_device/ios/objc/RTCAudioSessionTest.mm +++ b/webrtc/modules/audio_device/ios/objc/RTCAudioSessionTest.mm @@ -32,10 +32,10 @@ previousRoute:(AVAudioSessionRouteDescription *)previousRoute { } -- (void)audioSessionMediaServicesWereLost:(RTCAudioSession *)session { +- (void)audioSessionMediaServerTerminated:(RTCAudioSession *)session { } -- (void)audioSessionMediaServicesWereReset:(RTCAudioSession *)session { +- (void)audioSessionMediaServerReset:(RTCAudioSession *)session { } - (void)audioSessionShouldConfigure:(RTCAudioSession *)session {