Attachment 338759 Details for Bug 184979 – Patch

[patch] Patch

bug-184979-20180425110308.patch (text/plain), 2.17 KB, created by Eric Carlson on 2018-04-25 11:03:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-04-25 11:03:09 PDT

Size: 2.17 KB

patch

obsolete

>Subversion Revision: 230960
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5a83ef5c33ae8751a95812fc8a7a5829244a18a9..bd9704635719e29ef4088162ecf7f22b257e88ec 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-04-25  Eric Carlson  <eric.carlson@apple.com>
>+
>+        [iOS] Set route sharing policy when setting audio session category
>+        https://bugs.webkit.org/show_bug.cgi?id=184979
>+        <rdar://problem/39709577>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/audio/ios/AudioSessionIOS.mm:
>+        (WebCore::AudioSession::setCategory):
>+
> 2018-04-24  Jer Noble  <jer.noble@apple.com>
> 
>         Don't add system framework paths to FRAMEWORK_SEARCH_PATHS
>diff --git a/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm b/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm
>index 94cdf212dc1ec6ce383a15b34df504a180ac1019..33b04bbbc610fe4c5d7e1b1be8b2832fabd33c93 100644
>--- a/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm
>+++ b/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm
>@@ -111,6 +111,7 @@ void AudioSession::setCategory(CategoryType newCategory)
>     NSString *categoryString;
>     NSString *categoryMode = AVAudioSessionModeDefault;
>     AVAudioSessionCategoryOptions options = 0;
>+    AVAudioSessionRouteSharingPolicy policy = AVAudioSessionRouteSharingPolicyDefault;
> 
>     switch (newCategory) {
>     case AmbientSound:
>@@ -121,6 +122,7 @@ void AudioSession::setCategory(CategoryType newCategory)
>         break;
>     case MediaPlayback:
>         categoryString = AVAudioSessionCategoryPlayback;
>+        policy = AVAudioSessionRouteSharingPolicyLongForm;
>         break;
>     case RecordAudio:
>         categoryString = AVAudioSessionCategoryRecord;
>@@ -140,7 +142,7 @@ void AudioSession::setCategory(CategoryType newCategory)
>     }
> 
>     NSError *error = nil;
>-    [[AVAudioSession sharedInstance] setCategory:categoryString mode:categoryMode options:options error:&error];
>+    [[AVAudioSession sharedInstance] setCategory:categoryString mode:categoryMode routeSharingPolicy:policy options:options error:&error];
> #if !PLATFORM(IOS_SIMULATOR) && !ENABLE(MINIMAL_SIMULATOR)
>     ASSERT(!error);
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 184979: 338759