Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-22 13:33:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

check if subtitles are added before removing them

Browse Source 
Signed-off-by: Toni Förster <toni.foerster@gmail.com>
This commit is contained in:
Toni Förster 2024-09-09 14:18:49 +02:00
parent 5e85fd294c
commit 0de0445805
No known key found for this signature in database
GPG Key ID: 292F3E5086C83FC7
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Model/Player/Backends/MPVBackend.swift
View File

@ -25,7 +25,9 @@ final class MPVBackend: PlayerBackend {
var video: Video? var video: Video?
var captions: Captions? { didSet { var captions: Captions? { didSet {
guard let captions else { guard let captions else {
client?.removeSubs() if client?.areSubtitlesAdded == true {
client?.removeSubs()
}
return return
} }
addSubTrack(captions.url) addSubTrack(captions.url)
@ -615,7 +617,9 @@ final class MPVBackend: PlayerBackend {
} }
func addSubTrack(_ url: URL) { func addSubTrack(_ url: URL) {
client?.removeSubs() if client?.areSubtitlesAdded == true {
client?.removeSubs()
}
client?.addSubTrack(url) client?.addSubTrack(url)
} }

32
Model/Player/Backends/MPVClient.swift
View File

@ -42,7 +42,7 @@ final class MPVClient: ObservableObject {
mpv = mpv_create() mpv = mpv_create()
if mpv == nil { if mpv == nil {
print("failed creating context\n") logger.critical("failed creating context\n")
exit(1) exit(1)
} }
@ -147,7 +147,7 @@ final class MPVClient: ObservableObject {
] ]
if mpv_render_context_create(&mpvGL, mpv, &params) < 0 { if mpv_render_context_create(&mpvGL, mpv, &params) < 0 {
print("failed to initialize mpv GL context") logger.critical("failed to initialize mpv GL context")
exit(1) exit(1)
} }
@ -349,6 +349,26 @@ final class MPVClient: ObservableObject {
return Int(fps.rounded()) return Int(fps.rounded())
} }
var areSubtitlesAdded: Bool {
guard !mpv.isNil else { return false }
// Retrieve the number of tracks
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 = 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
}
}
}
return false
}
func logCurrentFps() { func logCurrentFps() {
let fps = currentContainerFps let fps = currentContainerFps
logger.info("Current container FPS: \(fps)") logger.info("Current container FPS: \(fps)")
@ -493,9 +513,9 @@ final class MPVClient: ObservableObject {
mode.refreshRate > 0 mode.refreshRate > 0
{ {
refreshRate = Int(mode.refreshRate) refreshRate = Int(mode.refreshRate)
print("Screen refresh rate: \(refreshRate) Hz") logger.info("Screen refresh rate: \(refreshRate) Hz")
} else { } else {
print("Failed to get refresh rate from NSScreen.") logger.warning("Failed to get refresh rate from NSScreen.")
} }
#else #else
// iOS implementation using UIScreen with a failover // iOS implementation using UIScreen with a failover
@ -505,9 +525,9 @@ final class MPVClient: ObservableObject {
// Failover: if maximumFramesPerSecond is 0 or an unexpected value // Failover: if maximumFramesPerSecond is 0 or an unexpected value
if refreshRate <= 0 { if refreshRate <= 0 {
refreshRate = 60 // Fallback to 60 Hz refreshRate = 60 // Fallback to 60 Hz
print("Failed to get refresh rate from UIScreen, falling back to 60 Hz.") logger.warning("Failed to get refresh rate from UIScreen, falling back to 60 Hz.")
} else { } else {
print("Screen refresh rate: \(refreshRate) Hz") logger.info("Screen refresh rate: \(refreshRate) Hz")
} }
#endif #endif