fix tvOS build

Signed-off-by: Toni Förster <toni.foerster@gmail.com>

Model/Import Export Settings/Exporters/ControlsSettingsGroupExporter.swift

@@ -5,7 +5,6 @@ final class ConstrolsSettingsGroupExporter: SettingsGroupExporter {
     override var globalJSON: JSON {
         [
             "avPlayerUsesSystemControls": Defaults[.avPlayerUsesSystemControls],
-            "fullscreenPlayerGestureEnabled": Defaults[.fullscreenPlayerGestureEnabled],
             "horizontalPlayerGestureEnabled": Defaults[.horizontalPlayerGestureEnabled],
             "seekGestureSensitivity": Defaults[.seekGestureSensitivity],
             "seekGestureSpeed": Defaults[.seekGestureSpeed],

Model/Import Export Settings/Importers/ControlsSettingsGroupImporter.swift

@@ -9,10 +9,6 @@ struct ConstrolsSettingsGroupImporter {
             Defaults[.avPlayerUsesSystemControls] = avPlayerUsesSystemControls
         }
 
-        if let fullscreenPlayerGestureEnabled = json["fullscreenPlayerGestureEnabled"].bool {
-            Defaults[.fullscreenPlayerGestureEnabled] = fullscreenPlayerGestureEnabled
-        }
-
         if let horizontalPlayerGestureEnabled = json["horizontalPlayerGestureEnabled"].bool {
             Defaults[.horizontalPlayerGestureEnabled] = horizontalPlayerGestureEnabled
         }

Model/Player/Backends/AVPlayerBackend.swift

@@ -181,7 +181,9 @@ final class AVPlayerBackend: PlayerBackend {
         {
             seek(to: 0, seekType: .loopRestart)
         }
-
+        #if !os(macOS)
+            model.setAudioSessionActive(true)
+        #endif
         avPlayer.play()
 
         // Setting hasStarted to true the first time player started
@@ -196,7 +198,9 @@ final class AVPlayerBackend: PlayerBackend {
         guard avPlayer.timeControlStatus != .paused else {
             return
         }
-
+        #if !os(macOS)
+            model.setAudioSessionActive(false)
+        #endif
         avPlayer.pause()
         model.objectWillChange.send()
     }
@@ -210,6 +214,9 @@ final class AVPlayerBackend: PlayerBackend {
     }
 
     func stop() {
+        #if !os(macOS)
+            model.setAudioSessionActive(false)
+        #endif
         avPlayer.replaceCurrentItem(with: nil)
         hasStarted = false
     }
@@ -364,11 +371,7 @@ final class AVPlayerBackend: PlayerBackend {
 
         let startPlaying = {
             #if !os(macOS)
-                do {
+                self.model.setAudioSessionActive(true)
-                    try AVAudioSession.sharedInstance().setActive(true)
-                } catch {
-                    self.logger.error("Error setting up audio session: \(error)")
-                }
             #endif
 
             self.setRate(self.model.currentRate)

Model/Player/Backends/MPVBackend.swift

@@ -253,11 +253,7 @@ final class MPVBackend: PlayerBackend {
 
         let startPlaying = {
             #if !os(macOS)
-                do {
+                self.model.setAudioSessionActive(true)
-                    try AVAudioSession.sharedInstance().setActive(true)
-                } catch {
-                    self.logger.error("Error setting up audio session: \(error)")
-                }
             #endif
 
             DispatchQueue.main.async { [weak self] in
@@ -359,6 +355,9 @@ final class MPVBackend: PlayerBackend {
     }
 
     func play() {
+        #if !os(macOS)
+            model.setAudioSessionActive(true)
+        #endif
         startClientUpdates()
         startRefreshRateUpdates()
 
@@ -387,6 +386,9 @@ final class MPVBackend: PlayerBackend {
     }
 
     func pause() {
+        #if !os(macOS)
+            model.setAudioSessionActive(false)
+        #endif
         stopClientUpdates()
         stopRefreshRateUpdates()
 
@@ -408,6 +410,9 @@ final class MPVBackend: PlayerBackend {
     }
 
     func stop() {
+        #if !os(macOS)
+            model.setAudioSessionActive(false)
+        #endif
         stopClientUpdates()
         stopRefreshRateUpdates()
         client?.stop()

Model/Player/PlayerModel.swift

@@ -232,6 +232,14 @@ final class PlayerModel: ObservableObject {
                 name: AVAudioSession.interruptionNotification,
                 object: nil
             )
+
+            // Register for audio session route change notifications
+            NotificationCenter.default.addObserver(
+                self,
+                selector: #selector(handleRouteChange(_:)),
+                name: AVAudioSession.routeChangeNotification,
+                object: AVAudioSession.sharedInstance()
+            )
         #endif
 
         playbackMode = Defaults[.playbackMode]
@@ -250,7 +258,15 @@ final class PlayerModel: ObservableObject {
 
     #if !os(macOS)
         deinit {
-            NotificationCenter.default.removeObserver(self, name: AVAudioSession.interruptionNotification, object: nil)
+            NotificationCenter.default.removeObserver(
+                self, name: AVAudioSession.interruptionNotification, object: nil
+            )
+
+            NotificationCenter.default.removeObserver(
+                self,
+                name: AVAudioSession.routeChangeNotification,
+                object: AVAudioSession.sharedInstance()
+            )
         }
     #endif
 
@@ -1276,12 +1292,27 @@ final class PlayerModel: ObservableObject {
     }
 
     #if !os(macOS)
+        func setAudioSessionActive(_ setActive: Bool) {
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
+                do {
+                    try AVAudioSession.sharedInstance().setActive(setActive)
+                } catch {
+                    self.logger.error("Error setting up audio session: \(error)")
+                }
+            }
+        }
+
         @objc func handleAudioSessionInterruption(_ notification: Notification) {
             logger.info("Audio session interruption received.")
-            logger.info("Notification received: \(notification)")
+            logger.info("Notification object: \(String(describing: notification.object))")
 
-            guard let info = notification.userInfo,
+            guard let info = notification.userInfo else {
-                  let typeValue = info[AVAudioSessionInterruptionTypeKey] as? UInt,
+                logger.info("userInfo is missing in the notification.")
+                return
+            }
+
+            // Extract the interruption type
+            guard let typeValue = info[AVAudioSessionInterruptionTypeKey] as? UInt,
                   let type = AVAudioSession.InterruptionType(rawValue: typeValue)
             else {
                 logger.info("AVAudioSessionInterruptionTypeKey is missing or not a UInt in userInfo.")
@@ -1290,23 +1321,103 @@ final class PlayerModel: ObservableObject {
 
             logger.info("Interruption type received: \(type)")
 
+            // Check availability for iOS 14.5 or newer to handle interruption reason
+            // Currently only for debugging purpose
+            #if os(iOS)
+                if #available(iOS 14.5, *) {
+                    // Extract the interruption reason, if available
+                    if let reasonValue = info[AVAudioSessionInterruptionReasonKey] as? UInt,
+                       let reason = AVAudioSession.InterruptionReason(rawValue: reasonValue)
+                    {
+                        logger.info("Interruption reason received: \(reason)")
+                        switch reason {
+                        case .default:
+                            logger.info("Interruption reason: Default or unspecified interruption occurred.")
+                        case .appWasSuspended:
+                            logger.info("Interruption reason: The app was suspended during the interruption.")
+                        @unknown default:
+                            logger.info("Unknown interruption reason received.")
+                        }
+                    } else {
+                        logger.info("AVAudioSessionInterruptionReasonKey is missing or not a UInt in userInfo.")
+                    }
+                } else {
+                    logger.info("Interruption reason handling is not available on this iOS version.")
+                }
+            #endif
+
+            // Handle the specific interruption type
             switch type {
             case .began:
-                logger.info("Audio session interrupted.")
-                // We need to call pause() to set all variables correctly, and play()
-                // directly afterwards, because the .began interrupt is sent after audio
-                // ducking ended and playback would pause. Audio ducking usually happens
-                // when using headphones.
                 pause()
-                play()
+                logger.info("Audio session interrupted (began).")
             case .ended:
+                // Extract any interruption options, if available
+                if let optionsValue = info[AVAudioSessionInterruptionOptionKey] as? UInt {
+                    logger.info("Interruption options received: \(optionsValue)")
+                    if optionsValue & AVAudioSession.InterruptionOptions.shouldResume.rawValue != 0 {
+                        play()
+                        logger.info("Interruption option indicates playback should resume automatically.")
+                    } else {
+                        logger.info("Interruption option indicates playback should not resume automatically.")
+                    }
+                } else {
+                    logger.info("AVAudioSessionInterruptionOptionKey is missing or not a UInt in userInfo.")
+                }
                 logger.info("Audio session interruption ended.")
-                // We need to call pause() to set all variables correctly.
+                // Check if audio was resumed or if there's any indication of ducking
-                // Otherwise, playback does not resume when the interruption ends.
+                let currentVolume = AVAudioSession.sharedInstance().outputVolume
-                pause()
+                logger.info("Current output volume: \(currentVolume)")
-                play()
             default:
-                break
+                logger.info("Unknown interruption type received.")
+            }
+        }
+
+        @objc func handleRouteChange(_ notification: Notification) {
+            logger.info("Audio route change received.")
+
+            guard let info = notification.userInfo else {
+                logger.info("userInfo is missing in the notification.")
+                return
+            }
+
+            guard let reasonValue = info[AVAudioSessionRouteChangeReasonKey] as? UInt,
+                  let reason = AVAudioSession.RouteChangeReason(rawValue: reasonValue)
+            else {
+                logger.info("AVAudioSessionRouteChangeReasonKey is missing or not a UInt in userInfo.")
+                return
+            }
+
+            logger.info("Route change reason received: \(reason)")
+
+            let currentCategory = AVAudioSession.sharedInstance().category
+            logger.info("Current audio session category before change: \(currentCategory)")
+
+            switch reason {
+            case .categoryChange:
+                logger.info("Audio session category changed.")
+                let newCategory = AVAudioSession.sharedInstance().category
+                logger.info("New audio session category: \(newCategory)")
+            case .oldDeviceUnavailable, .newDeviceAvailable:
+                logger.info("Audio route change may indicate ducking or device change.")
+                let currentRoute = AVAudioSession.sharedInstance().currentRoute
+                logger.info("Current audio route: \(currentRoute)")
+
+                for output in currentRoute.outputs {
+                    logger.info("Output port type: \(output.portType), UID: \(output.uid)")
+                    switch output.portType {
+                    case .headphones, .bluetoothA2DP:
+                        logger.info("Detected port type \(output.portType). Executing play().")
+                        play()
+                    default:
+                        logger.info("Detected port type \(output.portType). Executing pause().")
+                        pause()
+                    }
+                }
+            case .noSuitableRouteForCategory:
+                logger.info("No suitable route for the current category.")
+            default:
+                logger.info("Unhandled route change reason: \(reason)")
             }
         }
     #endif

Shared/Defaults.swift

@@ -116,7 +116,6 @@ extension Defaults.Keys {
 
     static let avPlayerUsesSystemControls = Key<Bool>("avPlayerUsesSystemControls", default: Constants.isTvOS)
     static let horizontalPlayerGestureEnabled = Key<Bool>("horizontalPlayerGestureEnabled", default: true)
-    static let fullscreenPlayerGestureEnabled = Key<Bool>("fullscreenPlayerGestureEnabled", default: true)
     static let seekGestureSensitivity = Key<Double>("seekGestureSensitivity", default: 30.0)
     static let seekGestureSpeed = Key<Double>("seekGestureSpeed", default: 0.5)
 

Shared/Player/PlayerDragGesture.swift

@@ -63,7 +63,7 @@ extension VideoPlayerView {
                 }
 
                 // Toggle fullscreen on upward drag only when not disabled
-                if fullscreenPlayerGestureEnabled, verticalDrag < -50 {
+                if verticalDrag < -50 {
                     player.toggleFullScreenAction()
                     disableGestureTemporarily()
                     return

Shared/Player/VideoPlayerView.swift

@@ -66,7 +66,6 @@ struct VideoPlayerView: View {
     #endif
 
     @Default(.horizontalPlayerGestureEnabled) var horizontalPlayerGestureEnabled
-    @Default(.fullscreenPlayerGestureEnabled) var fullscreenPlayerGestureEnabled
     @Default(.seekGestureSpeed) var seekGestureSpeed
     @Default(.seekGestureSensitivity) var seekGestureSensitivity
     @Default(.playerSidebar) var playerSidebar

Shared/Settings/PlayerControlsSettings.swift

@@ -8,7 +8,6 @@ struct PlayerControlsSettings: View {
     @Default(.playerControlsLayout) private var playerControlsLayout
     @Default(.fullScreenPlayerControlsLayout) private var fullScreenPlayerControlsLayout
     @Default(.horizontalPlayerGestureEnabled) private var horizontalPlayerGestureEnabled
-    @Default(.fullscreenPlayerGestureEnabled) private var fullscreenPlayerGestureEnabled
     @Default(.seekGestureSpeed) private var seekGestureSpeed
     @Default(.seekGestureSensitivity) private var seekGestureSensitivity
     @Default(.buttonBackwardSeekDuration) private var buttonBackwardSeekDuration
@@ -65,10 +64,9 @@ struct PlayerControlsSettings: View {
 
     @ViewBuilder var sections: some View {
         #if !os(tvOS)
-            Section(header: SettingsHeader(text: "Player Controls".localized()), footer: controlsLayoutFooter) {
+            Section(header: SettingsHeader(text: "Controls".localized()), footer: controlsLayoutFooter) {
-                avPlayerUsesSystemControlsToggle
+                #if !os(tvOS)
-                #if os(iOS)
+                    avPlayerUsesSystemControlsToggle
-                    fullscreenPlayerGestureEnabledToggle
                 #endif
                 horizontalPlayerGestureEnabledToggle
                 SettingsHeader(text: "Seek gesture sensitivity".localized(), secondary: true)
@@ -114,7 +112,7 @@ struct PlayerControlsSettings: View {
     }
 
     var controlsButtonsSection: some View {
-        Section(header: SettingsHeader(text: "Player Control Buttons".localized())) {
+        Section(header: SettingsHeader(text: "Controls Buttons".localized())) {
             controlButtonToggles
         }
     }
@@ -159,12 +157,8 @@ struct PlayerControlsSettings: View {
         #endif
     }
 
-    private var fullscreenPlayerGestureEnabledToggle: some View {
-        Toggle("Swipe up toggles fullscreen", isOn: $fullscreenPlayerGestureEnabled)
-    }
-
     private var horizontalPlayerGestureEnabledToggle: some View {
-        Toggle("Seek with horizontal swipe", isOn: $horizontalPlayerGestureEnabled)
+        Toggle("Seek with horizontal swipe on video", isOn: $horizontalPlayerGestureEnabled)
     }
 
     private var avPlayerUsesSystemControlsToggle: some View {