mirror of
https://github.com/yattee/yattee.git
synced 2024-11-09 15:58:20 +00:00
check if subtitles are added before removing them
Signed-off-by: Toni Förster <toni.foerster@gmail.com>
This commit is contained in:
parent
5e85fd294c
commit
0de0445805
@ -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 {
|
||||||
|
if client?.areSubtitlesAdded == true {
|
||||||
client?.removeSubs()
|
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) {
|
||||||
|
if client?.areSubtitlesAdded == true {
|
||||||
client?.removeSubs()
|
client?.removeSubs()
|
||||||
|
}
|
||||||
client?.addSubTrack(url)
|
client?.addSubTrack(url)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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, ¶ms) < 0 {
|
if mpv_render_context_create(&mpvGL, mpv, ¶ms) < 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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user