allow user to disable fullscreen swipe gesture

furthermore, some rewording

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

Model/Import Export Settings/Exporters/ControlsSettingsGroupExporter.swift

@@ -5,6 +5,7 @@ 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,6 +9,10 @@ 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/MPVClient.swift

@@ -79,21 +79,14 @@ final class MPVClient: ObservableObject {
         checkError(mpv_set_option_string(mpv, "user-agent", UserAgentManager.shared.userAgent))
         checkError(mpv_set_option_string(mpv, "initial-audio-sync", Defaults[.mpvInitialAudioSync] ? "yes" : "no"))
 
-        // A/V-SYNC //
-
         // Enable VSYNC – needed for `video-sync`
         checkError(mpv_set_option_string(mpv, "opengl-swapinterval", "1"))
         checkError(mpv_set_option_string(mpv, "video-sync", "display-resample"))
         checkError(mpv_set_option_string(mpv, "interpolation", "yes"))
         checkError(mpv_set_option_string(mpv, "tscale", "mitchell"))
         checkError(mpv_set_option_string(mpv, "tscale-window", "blackman"))
-        checkError(mpv_set_option_string(mpv, "vd-lavc-framedrop", "no"))
+        checkError(mpv_set_option_string(mpv, "vd-lavc-framedrop", "nonref"))
         checkError(mpv_set_option_string(mpv, "display-fps-override", "\(String(getScreenRefreshRate()))"))
-        checkError(mpv_set_option_string(mpv, "video-sync-max-factor", "1.1"))
-        checkError(mpv_set_option_string(mpv, "video-sync-max-video-change", "10"))
-        checkError(mpv_set_option_string(mpv, "audio-buffer", "0.2"))
-        checkError(mpv_set_option_string(mpv, "audio-wait-open", "no"))
-        checkError(mpv_set_option_string(mpv, "force-window", "yes"))
 
         // CPU //
 

Model/Player/PlayerModel.swift

@@ -269,15 +269,6 @@ final class PlayerModel: ObservableObject {
             }
         #endif
 
-        DispatchQueue.global(qos: .userInteractive).async { [weak self] in
-            guard let self else { return }
-
-            if !self.musicMode, self.activeBackend == .mpv {
-                self.mpvBackend.setVideoToAuto()
-                self.mpvBackend.controls.resetTimer()
-            }
-        }
-
         presentingPlayer = true
 
         #if os(macOS)
@@ -299,9 +290,6 @@ final class PlayerModel: ObservableObject {
         DispatchQueue.main.async { [weak self] in
             Delay.by(0.3) {
                 self?.exitFullScreen(showControls: false)
-                if self?.activeBackend == .mpv, !(self?.musicMode ?? false) {
-                    self?.mpvBackend.setVideoToNo()
-                }
             }
         }
 
@@ -1025,9 +1013,10 @@ final class PlayerModel: ObservableObject {
     #else
         func handleEnterForeground() {
             DispatchQueue.global(qos: .userInteractive).async { [weak self] in
-                guard let self else { return }
+                guard let self = self else { return }
 
-                if !self.musicMode, self.activeBackend == .mpv, presentingPlayer {
+                if !self.musicMode, self.activeBackend == .mpv {
+                    self.mpvBackend.addVideoTrackFromStream()
                     self.mpvBackend.setVideoToAuto()
                     self.mpvBackend.controls.resetTimer()
                 } else if !self.musicMode, self.activeBackend == .appleAVPlayer {
@@ -1058,7 +1047,7 @@ final class PlayerModel: ObservableObject {
                 pause()
             } else if !playingInPictureInPicture, activeBackend == .appleAVPlayer {
                 avPlayerBackend.removePlayerFromLayer()
-            } else if activeBackend == .mpv, !musicMode, presentingPlayer {
+            } else if activeBackend == .mpv, !musicMode {
                 mpvBackend.setVideoToNo()
             }
         }

Shared/Defaults.swift

@@ -116,6 +116,7 @@ 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 verticalDrag < -50 {
+                if fullscreenPlayerGestureEnabled, verticalDrag < -50 {
                     player.toggleFullScreenAction()
                     disableGestureTemporarily()
                     return

Shared/Player/VideoPlayerView.swift

@@ -66,6 +66,7 @@ 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,6 +8,7 @@ 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
@@ -64,9 +65,10 @@ struct PlayerControlsSettings: View {
 
     @ViewBuilder var sections: some View {
         #if !os(tvOS)
-            Section(header: SettingsHeader(text: "Controls".localized()), footer: controlsLayoutFooter) {
-                #if !os(tvOS)
-                    avPlayerUsesSystemControlsToggle
+            Section(header: SettingsHeader(text: "Player Controls".localized()), footer: controlsLayoutFooter) {
+                avPlayerUsesSystemControlsToggle
+                #if os(iOS)
+                    fullscreenPlayerGestureEnabledToggle
                 #endif
                 horizontalPlayerGestureEnabledToggle
                 SettingsHeader(text: "Seek gesture sensitivity".localized(), secondary: true)
@@ -112,7 +114,7 @@ struct PlayerControlsSettings: View {
     }
 
     var controlsButtonsSection: some View {
-        Section(header: SettingsHeader(text: "Controls Buttons".localized())) {
+        Section(header: SettingsHeader(text: "Player Control Buttons".localized())) {
             controlButtonToggles
         }
     }
@@ -157,8 +159,12 @@ 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 on video", isOn: $horizontalPlayerGestureEnabled)
+        Toggle("Seek with horizontal swipe", isOn: $horizontalPlayerGestureEnabled)
     }
 
     private var avPlayerUsesSystemControlsToggle: some View {