mirror of
https://github.com/yattee/yattee.git
synced 2025-10-10 17:38:15 +00:00
Player layout changes
This commit is contained in:
@@ -9,6 +9,10 @@ extension PlayerModel {
|
||||
currentItem?.video
|
||||
}
|
||||
|
||||
var videoForDisplay: Video? {
|
||||
videoBeingOpened ?? (closing ? nil : currentVideo)
|
||||
}
|
||||
|
||||
func play(_ videos: [Video], shuffling: Bool = false) {
|
||||
WatchNextViewModel.shared.presentingOutro = false
|
||||
playbackMode = shuffling ? .shuffle : .queue
|
||||
@@ -33,6 +37,8 @@ extension PlayerModel {
|
||||
closePiP()
|
||||
}
|
||||
|
||||
videoBeingOpened = video
|
||||
|
||||
prepareCurrentItemForHistory()
|
||||
|
||||
enqueueVideo(video, play: true, atTime: time, prepending: true) { _, item in
|
||||
@@ -70,9 +76,8 @@ extension PlayerModel {
|
||||
return
|
||||
}
|
||||
|
||||
self.videoBeingOpened = nil
|
||||
|
||||
if video.isLocal {
|
||||
self.videoBeingOpened = nil
|
||||
self.availableStreams = video.streams
|
||||
return
|
||||
}
|
||||
@@ -81,8 +86,11 @@ extension PlayerModel {
|
||||
let streamsInstance = video.streams.compactMap(\.instance).first
|
||||
|
||||
if video.streams.isEmpty || streamsInstance != playerInstance {
|
||||
self.loadAvailableStreams(video)
|
||||
self.loadAvailableStreams(video) { [weak self] _ in
|
||||
self?.videoBeingOpened = nil
|
||||
}
|
||||
} else {
|
||||
self.videoBeingOpened = nil
|
||||
self.availableStreams = self.streamsWithInstance(instance: playerInstance, streams: video.streams)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user