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 using Watch history in player queue

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-04-17 11:33:49 +02:00
parent 51b5c5709a
commit 52df6bf76e
5 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Model/Player/PlayerModel.swift
View File

@@ -201,7 +201,7 @@ final class PlayerModel: ObservableObject {
backend.pause()
}
func play(_ video: Video, at time: TimeInterval? = nil, inNavigationView: Bool = false) {
func play(_ video: Video, at time: CMTime? = nil, inNavigationView: Bool = false) {
playNow(video, at: time)
guard !playingInPictureInPicture else {

12
Model/Player/PlayerQueue.swift
View File

@@ -42,7 +42,7 @@ extension PlayerModel {
}
}
func playNow(_ video: Video, at time: TimeInterval? = nil) {
func playNow(_ video: Video, at time: CMTime? = nil) {
if playingInPictureInPicture, closePiPOnNavigation {
closePiP()
}
@@ -54,7 +54,7 @@ extension PlayerModel {
}
}
func playItem(_ item: PlayerQueueItem, video: Video? = nil, at time: TimeInterval? = nil) {
func playItem(_ item: PlayerQueueItem, video: Video? = nil, at time: CMTime? = nil) {
if !playingInPictureInPicture {
backend.closeItem()
}
@@ -64,7 +64,7 @@ extension PlayerModel {
currentItem = item
if !time.isNil {
currentItem.playbackTime = .secondsInDefaultTimescale(time!)
currentItem.playbackTime = time
} else if currentItem.playbackTime.isNil {
currentItem.playbackTime = .zero
}
@@ -105,7 +105,7 @@ extension PlayerModel {
}
}
func advanceToItem(_ newItem: PlayerQueueItem, at time: TimeInterval? = nil) {
func advanceToItem(_ newItem: PlayerQueueItem, at time: CMTime? = nil) {
prepareCurrentItemForHistory()
remove(newItem)
@@ -177,8 +177,8 @@ extension PlayerModel {
}
}
func playHistory(_ item: PlayerQueueItem) {
var time = item.playbackTime
func playHistory(_ item: PlayerQueueItem, at time: CMTime? = nil) {
var time = time ?? item.playbackTime
if item.shouldRestartPlaying {
time = .zero