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 {
-        guard let captions else {
-            if client?.areSubtitlesAdded == true {
-                client?.removeSubs()
+    var captions: Captions? {
+        didSet {
+            Task {
+                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 {
-            client?.removeSubs()
+        Task {
+            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 = getInt("track-list/count")
+        let trackCount = await Task(operation: { getInt("track-list/count") }).value
         guard trackCount > 0 else { return false }
 
         for index in 0 ..< trackCount {
-            // Get the type of each track
-            if let trackType = getString("track-list/\(index)/type"), trackType == "sub" {
-                // Check if the subtitle track is currently selected
-                let selected = getInt("track-list/\(index)/selected")
-                if selected == 1 {
-                    return true
-                }
+            if let trackType = await Task(operation: { getString("track-list/\(index)/type") }).value, trackType == "sub" {
+                return true
             }
         }
         return false
@@ -539,12 +533,16 @@ final class MPVClient: ObservableObject {
         command("video-add", args: [url.absoluteString])
     }
 
-    func addSubTrack(_ url: URL) {
-        command("sub-add", args: [url.absoluteString])
+    func addSubTrack(_ url: URL) async {
+        await Task {
+            command("sub-add", args: [url.absoluteString])
+        }.value
     }
 
-    func removeSubs() {
-        command("sub-remove")
+    func removeSubs() async {
+        await Task {
+            command("sub-remove")
+        }.value
     }
 
     func setVideoToAuto() {

Open in Yattee/Open in Yattee.entitlements

@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.ZYMM2HKXY2.yattee.app.url</string>
+		<string>group.78Z5H3M6RJ.stream.yattee.app.urlbookmarks</string>
 	</array>
 </dict>
 </plist>

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/MPV/MPVOGLView.swift

@@ -11,7 +11,6 @@ final class MPVOGLView: GLKView {
     var mpvGL: UnsafeMutableRawPointer?
     var queue = DispatchQueue(label: "stream.yattee.opengl", qos: .userInteractive)
     var needsDrawing = true
-    private var dirtyRegion: CGRect?
 
     override init(frame: CGRect) {
         guard let context = EAGLContext(api: .openGLES2) else {
@@ -86,7 +85,6 @@ final class MPVOGLView: GLKView {
     @objc private func updateFrame() {
         // Trigger the drawing process if needed
         if needsDrawing {
-            markRegionAsDirty(bounds)
             setNeedsDisplay()
         }
     }
@@ -102,60 +100,16 @@ final class MPVOGLView: GLKView {
         glClear(UInt32(GL_COLOR_BUFFER_BIT))
     }
 
-    // Function to set a dirty region when a part of the screen changes
-    func markRegionAsDirty(_ region: CGRect) {
-        if dirtyRegion == nil {
-            dirtyRegion = region
-        } else {
-            // Expand the dirty region to include the new region
-            dirtyRegion = dirtyRegion!.union(region)
-        }
-    }
-
-    // Logic to decide if only part of the screen needs updating
-    private func needsPartialUpdate() -> Bool {
-        // Check if there is a defined dirty region that needs updating
-        if let dirtyRegion, !dirtyRegion.isEmpty {
-            // Set up glScissor based on dirtyRegion coordinates
-            glScissor(GLint(dirtyRegion.origin.x), GLint(dirtyRegion.origin.y), GLsizei(dirtyRegion.width), GLsizei(dirtyRegion.height))
-            return true
-        }
-        return false
-    }
-
-    // Call this function when you know the entire screen needs updating
-    private func clearDirtyRegion() {
-        dirtyRegion = nil
-    }
-
     override func draw(_: CGRect) {
         guard needsDrawing, let mpvGL else { return }
 
-        // Ensure the correct context is set
-        guard EAGLContext.setCurrent(context) else {
-            logger.error("Failed to set current OpenGL context.")
-            return
-        }
-
         // Bind the default framebuffer
         glGetIntegerv(UInt32(GL_FRAMEBUFFER_BINDING), &defaultFBO!)
 
-        // Ensure the framebuffer is valid
-        guard defaultFBO != nil && defaultFBO! != 0 else {
-            logger.error("Invalid framebuffer ID.")
-            return
-        }
-
         // Get the current viewport dimensions
         var dims: [GLint] = [0, 0, 0, 0]
         glGetIntegerv(GLenum(GL_VIEWPORT), &dims)
 
-        // Check if we need partial updates
-        if needsPartialUpdate() {
-            logger.info("Performing partial update with scissor test.")
-            glEnable(GLenum(GL_SCISSOR_TEST))
-        }
-
         // Set up the OpenGL FBO data
         var data = mpv_opengl_fbo(
             fbo: Int32(defaultFBO!),
@@ -175,23 +129,9 @@ final class MPVOGLView: GLKView {
                     mpv_render_param(type: MPV_RENDER_PARAM_FLIP_Y, data: flipPtr),
                     mpv_render_param()
                 ]
-                // Call the render function and check for errors
-                let result = mpv_render_context_render(OpaquePointer(mpvGL), &params)
-                if result < 0 {
-                    logger.error("mpv_render_context_render() failed with error code: \(result)")
-                } else {
-                    logger.info("mpv_render_context_render() called successfully.")
-                }
+                mpv_render_context_render(OpaquePointer(mpvGL), &params)
             }
         }
-
-        // Disable the scissor test after rendering if it was enabled
-        if needsPartialUpdate() {
-            glDisable(GLenum(GL_SCISSOR_TEST))
-        }
-
-        // Clear dirty region after drawing
-        clearDirtyRegion()
     }
 }