improved subtitle handling

- fix subtitle disabling not working
- make subtitle adding/removing async
- make subtitle menu non blocking

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/MPVBackend.swift

@@ -23,15 +23,14 @@ final class MPVBackend: PlayerBackend {
 
     var stream: Stream?
     var video: Video?
-    var captions: Captions? { didSet {
+    var captions: Captions? {
-        guard let captions else {
+        didSet {
-            if client?.areSubtitlesAdded == true {
+            Task {
-                client?.removeSubs()
+                await handleCaptionsChange()
             }
-            return
         }
-        addSubTrack(captions.url)
+    }
-    }}
+
     var currentTime: CMTime?
 
     var loadedVideo = false
@@ -617,10 +616,14 @@ final class MPVBackend: PlayerBackend {
     }
 
     func addSubTrack(_ url: URL) {
-        if client?.areSubtitlesAdded == true {
+        Task {
-            client?.removeSubs()
+            if let areSubtitlesAdded = client?.areSubtitlesAdded {
+                if await areSubtitlesAdded() {
+                    await client?.removeSubs()
+                }
+            }
+            await client?.addSubTrack(url)
         }
-        client?.addSubTrack(url)
     }
 
     func setVideoToAuto() {
@@ -684,6 +687,17 @@ final class MPVBackend: PlayerBackend {
         }
     }
 
+    private func handleCaptionsChange() async {
+        guard let captions else {
+            if let isSubtitlesAdded = client?.areSubtitlesAdded, await isSubtitlesAdded() {
+                await client?.removeSubs()
+            }
+            return
+        }
+
+        addSubTrack(captions.url)
+    }
+
     private func handlePropertyChange(_ name: String, _ property: mpv_event_property) {
         switch name {
         case "pause":

Model/Player/Backends/MPVClient.swift

@@ -349,21 +349,15 @@ final class MPVClient: ObservableObject {
         return Int(fps.rounded())
     }
 
-    var areSubtitlesAdded: Bool {
+    func areSubtitlesAdded() async -> Bool {
         guard !mpv.isNil else { return false }
 
-        // Retrieve the number of tracks
+        let trackCount = await Task(operation: { getInt("track-list/count") }).value
-        let trackCount = getInt("track-list/count")
         guard trackCount > 0 else { return false }
 
         for index in 0 ..< trackCount {
-            // Get the type of each track
+            if let trackType = await Task(operation: { getString("track-list/\(index)/type") }).value, trackType == "sub" {
-            if let trackType = getString("track-list/\(index)/type"), trackType == "sub" {
+                return true
-                // Check if the subtitle track is currently selected
-                let selected = getInt("track-list/\(index)/selected")
-                if selected == 1 {
-                    return true
-                }
             }
         }
         return false
@@ -539,12 +533,16 @@ final class MPVClient: ObservableObject {
         command("video-add", args: [url.absoluteString])
     }
 
-    func addSubTrack(_ url: URL) {
+    func addSubTrack(_ url: URL) async {
-        command("sub-add", args: [url.absoluteString])
+        await Task {
+            command("sub-add", args: [url.absoluteString])
+        }.value
     }
 
-    func removeSubs() {
+    func removeSubs() async {
-        command("sub-remove")
+        await Task {
+            command("sub-remove")
+        }.value
     }
 
     func setVideoToAuto() {

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/Controls/ControlsOverlay.swift

@@ -5,6 +5,8 @@ struct ControlsOverlay: View {
     @ObservedObject private var player = PlayerModel.shared
     private var model = PlayerControlsModel.shared
 
+    @State private var availableCaptions: [Captions] = []
+    @State private var isLoadingCaptions = true
     @State private var contentSize: CGSize = .zero
 
     @Default(.showMPVPlaybackStats) private var showMPVPlaybackStats
@@ -335,7 +337,6 @@ struct ControlsOverlay: View {
                     Image(systemName: "text.bubble")
                     if let captions = captionsBinding.wrappedValue,
                        let language = LanguageCodes(rawValue: captions.code)
-
                     {
                         Text("\(language.description.capitalized) (\(language.rawValue))")
                             .foregroundColor(.accentColor)
@@ -380,17 +381,16 @@ struct ControlsOverlay: View {
             .contextMenu {
                 Button("Disabled") { captionsBinding.wrappedValue = nil }
 
-                ForEach(player.currentVideo?.captions ?? []) { caption in
+                ForEach(availableCaptions) { caption in
                     Button(caption.description) { captionsBinding.wrappedValue = caption }
                 }
                 Button("Cancel", role: .cancel) {}
             }
-
         #endif
     }
 
     @ViewBuilder private var captionsPicker: some View {
-        let captions = player.currentVideo?.captions ?? []
+        let captions = availableCaptions
         Picker("Captions", selection: captionsBinding) {
             if captions.isEmpty {
                 Text("Not available").tag(Captions?.none)
@@ -402,6 +402,31 @@ struct ControlsOverlay: View {
             }
         }
         .disabled(captions.isEmpty)
+        .onAppear {
+            loadCaptions()
+        }
+    }
+
+    private func loadCaptions() {
+        isLoadingCaptions = true
+
+        // Fetch captions asynchronously
+        Task {
+            let fetchedCaptions = await fetchCaptions()
+            await MainActor.run {
+                // Update state on the main thread
+                self.availableCaptions = fetchedCaptions
+                self.isLoadingCaptions = false
+            }
+        }
+    }
+
+    private func fetchCaptions() async -> [Captions] {
+        // Access currentVideo from the main actor context
+        await MainActor.run {
+            // Safely access the main actor-isolated currentVideo property
+            player.currentVideo?.captions ?? []
+        }
     }
 
     private var captionsBinding: Binding<Captions?> {

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 {