Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-08-06 10:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crashes

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-12-21 18:13:41 +01:00
parent 6594d5ba95
commit 18cbbd3c90
8 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,6 +438,7 @@ final class MPVClient: ObservableObject {
}
private func setString(_ name: String, _ value: String) {
guard mpv != nil else { return }
mpv_set_property_string(mpv, name, value)
}

2
Model/Player/PlayerModel.swift
View File

@@ -724,7 +724,7 @@ final class PlayerModel: ObservableObject {
DispatchQueue.main.asyncAfter(deadline: .now() + 3) { [weak self] in
guard let self else { return }
self.playerAPI(item.video).loadDetails(item, completionHandler: { newItem in
self.playerAPI(item.video)?.loadDetails(item, completionHandler: { newItem in
guard newItem.videoID == self.autoplayItem?.videoID else { return }
self.autoplayItem = newItem
self.updateRemoteCommandCenter()

6
Model/Player/PlayerQueue.swift
View File

@@ -100,7 +100,7 @@ extension PlayerModel {
InstancesModel.shared.forPlayer ?? accounts.current?.instance ?? InstancesModel.shared.all.first
}
func playerAPI(_ video: Video) -> VideosAPI! {
func playerAPI(_ video: Video) -> VideosAPI? {
guard let url = video.instanceURL else { return accounts.api }
switch video.app {
case .local:
@@ -181,7 +181,7 @@ extension PlayerModel {
let playTime = currentItem.shouldRestartPlaying ? CMTime.zero : time
guard let video = newItem.video else { return }
playerAPI(video).loadDetails(currentItem, failureHandler: { self.videoLoadFailureHandler($0, video: self.currentItem.video) }) { newItem in
playerAPI(video)?.loadDetails(currentItem, failureHandler: { self.videoLoadFailureHandler($0, video: video) }) { newItem in
self.playItem(newItem, at: playTime)
}
}
@@ -228,7 +228,7 @@ extension PlayerModel {
}
if loadDetails {
playerAPI(item.video).loadDetails(item, failureHandler: { self.videoLoadFailureHandler($0, video: video) }) { [weak self] newItem in
playerAPI(item.video)?.loadDetails(item, failureHandler: { self.videoLoadFailureHandler($0, video: video) }) { [weak self] newItem in
guard let self else { return }
videoDetailsLoadHandler(newItem.video, newItem)

3
Model/Player/PlayerStreams.swift
View File

@@ -20,8 +20,9 @@ extension PlayerModel {
guard let playerInstance else { return }
guard let api = playerAPI(video) else { return }
logger.info("loading streams from \(playerInstance.description)")
fetchStreams(playerAPI(video).video(video.videoID), instance: playerInstance, video: video, onCompletion: onCompletion)
fetchStreams(api.video(video.videoID), instance: playerInstance, video: video, onCompletion: onCompletion)
}
private func fetchStreams(