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

Controls layouts, gestures and settings

Browse Source
This commit is contained in:
Arkadiusz Fal
2022-08-28 19:18:49 +02:00
parent 5b785cc9c2
commit 0f7d826a3e
28 changed files with 1318 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Model/Player/PlayerModel.swift
View File

@@ -98,7 +98,7 @@ final class PlayerModel: ObservableObject {
@Published var queue = [PlayerQueueItem]() { didSet { handleQueueChange() } }
@Published var currentItem: PlayerQueueItem! { didSet { handleCurrentItemChange() } }
@Published var videoBeingOpened: Video?
@Published var videoBeingOpened: Video? { didSet { playerTime.reset() } }
@Published var historyVideos = [Video]()
@Published var preservedTime: CMTime?
@@ -505,7 +505,16 @@ final class PlayerModel: ObservableObject {
self.backend.setNeedsDrawing(self.presentingPlayer)
}
controls.hide()
#if os(tvOS)
if presentingPlayer {
controls.show()
Delay.by(1) { [weak self] in
self?.controls.hide()
}
}
#else
controls.hide()
#endif
#if !os(macOS)
UIApplication.shared.isIdleTimerDisabled = presentingPlayer
@@ -531,6 +540,8 @@ final class PlayerModel: ObservableObject {
logger.info("changing backend from \(from.rawValue) to \(to.rawValue)")
let wasPlaying = isPlaying
if to == .mpv {
closePiP()
}
@@ -543,18 +554,22 @@ final class PlayerModel: ObservableObject {
self.backend.didChangeTo()
fromBackend.pause()
if wasPlaying {
fromBackend.pause()
}
guard var stream = stream, changingStream else {
return
}
if let stream = toBackend.stream, toBackend.video == fromBackend.video {
toBackend.seek(to: fromBackend.currentTime?.seconds ?? .zero) { finished in
toBackend.seek(to: fromBackend.currentTime?.seconds ?? .zero, seekType: .backendSync) { finished in
guard finished else {
return
}
toBackend.play()
if wasPlaying {
toBackend.play()
}
}
self.stream = stream
@@ -764,17 +779,17 @@ final class PlayerModel: ObservableObject {
skipBackwardCommand.preferredIntervals = preferredIntervals
skipForwardCommand.addTarget { [weak self] _ in
self?.backend.seek(relative: .secondsInDefaultTimescale(10))
self?.backend.seek(relative: .secondsInDefaultTimescale(10), seekType: .userInteracted)
return .success
}
skipBackwardCommand.addTarget { [weak self] _ in
self?.backend.seek(relative: .secondsInDefaultTimescale(-10))
self?.backend.seek(relative: .secondsInDefaultTimescale(-10), seekType: .userInteracted)
return .success
}
previousTrackCommand.addTarget { [weak self] _ in
self?.backend.seek(to: .zero)
self?.backend.seek(to: .zero, seekType: .userInteracted)
return .success
}
@@ -801,7 +816,7 @@ final class PlayerModel: ObservableObject {
MPRemoteCommandCenter.shared().changePlaybackPositionCommand.addTarget { [weak self] remoteEvent in
guard let event = remoteEvent as? MPChangePlaybackPositionCommandEvent else { return .commandFailed }
self?.backend.seek(to: event.positionTime)
self?.backend.seek(to: event.positionTime, seekType: .userInteracted)
return .success
}