Changeset 231921 in webkit

Timestamp:

May 17, 2018 2:48:49 PM (6 years ago)

Author:

eric.carlson@apple.com

Message:

[iOS] Update AirPlay route monitoring
​https://bugs.webkit.org/show_bug.cgi?id=185706
<rdar://problem/40230677>

Unreviewed, fix extra zoom mode build after r231913.

• platform/audio/ios/MediaSessionManagerIOS.mm:

(-[WebMediaSessionHelper dealloc]):
(-[WebMediaSessionHelper hasWirelessTargetsAvailable]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/ios/MediaSessionManagerIOS.mm (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-05-17  Eric Carlson  <eric.carlson@apple.com>
+
+        [iOS] Update AirPlay route monitoring
+        https://bugs.webkit.org/show_bug.cgi?id=185706
+        <rdar://problem/40230677>
+
+        Unreviewed, fix extra zoom mode build after r231913.
+
+        * platform/audio/ios/MediaSessionManagerIOS.mm:
+        (-[WebMediaSessionHelper dealloc]):
+        (-[WebMediaSessionHelper hasWirelessTargetsAvailable]):
+
 2018-05-17  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm

@@ -52 +52 @@
 SOFT_LINK_FRAMEWORK(AVFoundation)
 SOFT_LINK_CLASS(AVFoundation, AVAudioSession)
-SOFT_LINK_CLASS(AVFoundation, AVRouteDetector)
 SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionNotification, NSString *)
 SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionTypeKey, NSString *)
 SOFT_LINK_POINTER(AVFoundation, AVAudioSessionInterruptionOptionKey, NSString *)
 SOFT_LINK_POINTER(AVFoundation, AVRouteDetectorMultipleRoutesDetectedDidChangeNotification, NSString *)
+
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
+SOFT_LINK_CLASS(AVFoundation, AVRouteDetector)
+#endif
 
 #define AVAudioSession getAVAudioSessionClass()
@@ -102 +105 @@
     MediaSessionManageriOS* _callback;
 
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
     RetainPtr<AVRouteDetector> _routeDetector;
+#endif
     bool _monitoringAirPlayRoutes;
     bool _startMonitoringAirPlayRoutesPending;
@@ -116 +121 @@
 - (BOOL)hasWirelessTargetsAvailable;
 
-#if HAVE(MEDIA_PLAYER)
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
 - (void)startMonitoringAirPlayRoutes;
 - (void)stopMonitoringAirPlayRoutes;
@@ -346 +351 @@
     LOG(Media, "-[WebMediaSessionHelper dealloc]");
 
-#if HAVE(MEDIA_PLAYER)
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
     if (!pthread_main_np()) {
         dispatch_async(dispatch_get_main_queue(), [routeDetector = WTFMove(_routeDetector)] () mutable {
@@ -372 +377 @@
 {
     LOG(Media, "-[WebMediaSessionHelper hasWirelessTargetsAvailable]");
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
     return _routeDetector.get().multipleRoutesDetected;
-}
-
-#if HAVE(MEDIA_PLAYER)
+#else
+    return NO;
+#endif
+}
+
+#if HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
 - (void)startMonitoringAirPlayRoutes
 {
@@ -420 +429 @@
     _routeDetector.get().routeDetectionEnabled = NO;
 }
-#endif // HAVE(MEDIA_PLAYER)
+#endif // HAVE(MEDIA_PLAYER) && !ENABLE(EXTRA_ZOOM_MODE)
 
 - (void)interruption:(NSNotification *)notification