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/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

@@ -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 //
 
@@ -356,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
@@ -546,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() {

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/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?> {