Changeset 243940 in webkit

Timestamp:

Apr 5, 2019, 11:21:40 AM (7 years ago)

Author:

eric.carlson@apple.com

Message:

Stop including <AudioToolbox/AudioSession.h>
​https://bugs.webkit.org/show_bug.cgi?id=196648
<rdar://problem/39665771>

Reviewed by Jer Noble.

• WebView/WebPreferencesPrivate.h:

Location:

trunk/Source/WebKitLegacy/mac

Files:

• ChangeLog (modified) (1 diff)
• WebView/WebPreferences.mm (modified) (2 diffs)
• WebView/WebPreferencesPrivate.h (modified) (1 diff)

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2019-04-05  Eric Carlson  <eric.carlson@apple.com>
+
+        Stop including <AudioToolbox/AudioSession.h>
+        https://bugs.webkit.org/show_bug.cgi?id=196648
+        <rdar://problem/39665771>
+
+        Reviewed by Jer Noble.
+
+        * WebView/WebPreferencesPrivate.h:
+
 2019-04-04  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKitLegacy/mac/WebView/WebPreferences.mm

@@ -53 +53 @@
 
 using namespace WebCore;
-
-#if HAVE(AUDIO_TOOLBOX_AUDIO_SESSION)
-#import <AudioToolbox/AudioSession.h>
-#endif
 
 #if PLATFORM(IOS_FAMILY)
@@ -2390 +2386 @@
         // which need to be translated into AudioSession::CategoryType:
         switch (override) {
-        case kAudioSessionCategory_AmbientSound:
+        case WebKitAudioSessionCategoryAmbientSound:
             override = AudioSession::AmbientSound;
             break;
-        case kAudioSessionCategory_SoloAmbientSound:
+        case WebKitAudioSessionCategorySoloAmbientSound:
             override = AudioSession::SoloAmbientSound;
             break;
-        case kAudioSessionCategory_MediaPlayback:
+        case WebKitAudioSessionCategoryMediaPlayback:
             override = AudioSession::MediaPlayback;
             break;
-        case kAudioSessionCategory_RecordAudio:
+        case WebKitAudioSessionCategoryRecordAudio:
             override = AudioSession::RecordAudio;
             break;
-        case kAudioSessionCategory_PlayAndRecord:
+        case WebKitAudioSessionCategoryPlayAndRecord:
             override = AudioSession::PlayAndRecord;
             break;
-        case kAudioSessionCategory_AudioProcessing:
+        case WebKitAudioSessionCategoryAudioProcessing:
             override = AudioSession::AudioProcessing;
             break;

trunk/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h

@@ -62 +62 @@
     WebKitFrameFlatteningFullyEnabled
 } WebKitFrameFlattening;
+
+typedef enum : unsigned {
+    WebKitAudioSessionCategoryAmbientSound = 'ambi',
+    WebKitAudioSessionCategorySoloAmbientSound = 'solo',
+    WebKitAudioSessionCategoryMediaPlayback = 'medi',
+    WebKitAudioSessionCategoryRecordAudio = 'reca',
+    WebKitAudioSessionCategoryPlayAndRecord = 'plar',
+    WebKitAudioSessionCategoryAudioProcessing = 'proc',
+} WebKitAudioSessionCategory;
 
 extern NSString *WebPreferencesChangedNotification WEBKIT_DEPRECATED_MAC(10_3, 10_14);