Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2024-12-22 21:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add setting for closing player after playing last item (fix #98)

Browse Source
This commit is contained in:
Arkadiusz Fal 2022-06-25 15:14:16 +02:00
parent c940fb3198
commit 17787fa69c
7 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Model/Player/Backends/AVPlayerBackend.swift
View File

@ -464,20 +464,24 @@ final class AVPlayerBackend: PlayerBackend {
}
@objc func itemDidPlayToEndTime() {
model.prepareCurrentItemForHistory(finished: true)
if Defaults[.closeLastItemOnPlaybackEnd] {
model.prepareCurrentItemForHistory(finished: true)
}
if model.queue.isEmpty {
#if !os(macOS)
try? AVAudioSession.sharedInstance().setActive(false)
#endif
model.resetQueue()
#if os(tvOS)
controller?.playerView.dismiss(animated: false) { [weak self] in
self?.controller?.dismiss(animated: true)
}
#else
model.hide()
#endif
if Defaults[.closeLastItemOnPlaybackEnd] {
model.resetQueue()
#if os(tvOS)
controller?.playerView.dismiss(animated: false) { [weak self] in
self?.controller?.dismiss(animated: true)
}
#else
model.hide()
#endif
}
} else {
if model.playingInPictureInPicture {
startPictureInPictureOnPlay = true

20
Model/Player/Backends/MPVBackend.swift
View File

@ -376,6 +376,8 @@ final class MPVBackend: PlayerBackend {
}
func handle(_ event: UnsafePointer<mpv_event>!) {
logger.info(.init(stringLiteral: "RECEIVED event: \(String(cString: mpv_event_name(event.pointee.event_id)))"))
switch event.pointee.event_id {
case MPV_EVENT_SHUTDOWN:
mpv_destroy(client.mpv)
@ -401,9 +403,11 @@ final class MPVBackend: PlayerBackend {
onFileLoaded = nil
case MPV_EVENT_PAUSE:
isPlaying = false
networkStateTimer.resume()
case MPV_EVENT_UNPAUSE:
isPlaying = true
isLoadingVideo = false
isSeeking = false
networkStateTimer.resume()
@ -413,7 +417,7 @@ final class MPVBackend: PlayerBackend {
case MPV_EVENT_END_FILE:
DispatchQueue.main.async { [weak self] in
self?.handleEndOfFile(event)
self?.handleEndOfFile()
}
default:
@ -421,20 +425,26 @@ final class MPVBackend: PlayerBackend {
}
}
func handleEndOfFile(_: UnsafePointer<mpv_event>!) {
func handleEndOfFile() {
guard handleEOF, !isLoadingVideo else {
return
}
model.prepareCurrentItemForHistory(finished: true)
getClientUpdates()
if Defaults[.closeLastItemOnPlaybackEnd] {
model.prepareCurrentItemForHistory(finished: true)
}
if model.queue.isEmpty {
#if !os(macOS)
try? AVAudioSession.sharedInstance().setActive(false)
#endif
model.resetQueue()
model.hide()
if Defaults[.closeLastItemOnPlaybackEnd] {
model.resetQueue()
model.hide()
}
} else {
model.advanceToNextItem()
}

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

@ -48,6 +48,7 @@ final class MPVClient: ObservableObject {
checkError(mpv_set_option_string(mpv, "cache-pause-initial", "yes"))
checkError(mpv_set_option_string(mpv, "cache-secs", "20"))
checkError(mpv_set_option_string(mpv, "cache-pause-wait", "2"))
checkError(mpv_set_option_string(mpv, "keep-open", "yes"))
checkError(mpv_set_option_string(mpv, "hwdec", "auto-safe"))
checkError(mpv_set_option_string(mpv, "vo", "libmpv"))

11
Model/Player/PlayerSponsorBlock.swift
View File

@ -41,16 +41,21 @@ extension PlayerModel {
return
}
self.prepareCurrentItemForHistory(finished: true)
self.pause()
if Defaults[.closeLastItemOnPlaybackEnd] {
self.prepareCurrentItemForHistory(finished: true)
}
if self.queue.isEmpty {
#if !os(macOS)
try? AVAudioSession.sharedInstance().setActive(false)
#endif
self.resetQueue()
self.hide()
if Defaults[.closeLastItemOnPlaybackEnd] {
self.resetQueue()
self.hide()
}
} else {
self.advanceToNextItem()
}

3
Shared/Defaults.swift
View File

@ -63,6 +63,7 @@ extension Defaults.Keys {
static let commentsPlacement = Key<CommentsPlacement>("commentsPlacement", default: .separate)
#endif
static let pauseOnHidingPlayer = Key<Bool>("pauseOnHidingPlayer", default: defaultForPauseOnHidingPlayer)
static let closeLastItemOnPlaybackEnd = Key<Bool>("closeLastItemOnPlaybackEnd", default: false)
static let closePiPOnNavigation = Key<Bool>("closePiPOnNavigation", default: false)
static let closePiPOnOpeningPlayer = Key<Bool>("closePiPOnOpeningPlayer", default: false)
@ -98,8 +99,6 @@ extension Defaults.Keys {
static let showMPVPlaybackStats = Key<Bool>("showMPVPlaybackStats", default: false)
static let playerDetailsPageButtonLabelStyle = Key<PlayerDetailsPageButtonLabelStyle>("playerDetailsPageButtonLabelStyle", default: defaultForPlayerDetailsPageButtonLabelStyle)
static let controlsBarInPlayer = Key<Bool>("controlsBarInPlayer", default: true)
}
enum ResolutionSetting: String, CaseIterable, Defaults.Serializable {

1
Shared/Player/VideoDetails.swift
View File

@ -43,7 +43,6 @@ struct VideoDetails: View {
@Default(.showKeywords) private var showKeywords
@Default(.playerDetailsPageButtonLabelStyle) private var playerDetailsPageButtonLabelStyle
@Default(.controlsBarInPlayer) private var controlsBarInPlayer
var currentPage: DetailsPage {
DetailsPage.allCases.first { $0.index == page.index } ?? .info

6
Shared/Settings/PlayerSettings.swift
View File

@ -15,6 +15,7 @@ struct PlayerSettings: View {
@Default(.showHistoryInPlayer) private var showHistory
@Default(.showKeywords) private var showKeywords
@Default(.pauseOnHidingPlayer) private var pauseOnHidingPlayer
@Default(.closeLastItemOnPlaybackEnd) private var closeLastItemOnPlaybackEnd
#if os(iOS)
@Default(.honorSystemOrientationLock) private var honorSystemOrientationLock
@Default(.lockOrientationInFullScreen) private var lockOrientationInFullScreen
@ -62,6 +63,7 @@ struct PlayerSettings: View {
sourcePicker
qualityPicker
pauseOnHidingPlayerToggle
closeLastItemOnPlaybackEndToggle
}
Section(header: SettingsHeader(text: "Comments")) {
@ -209,6 +211,10 @@ struct PlayerSettings: View {
Toggle("Pause when player is closed", isOn: $pauseOnHidingPlayer)
}
private var closeLastItemOnPlaybackEndToggle: some View {
Toggle("Close video after playing last in the queue", isOn: $closeLastItemOnPlaybackEnd)
}
#if os(iOS)
private var honorSystemOrientationLockToggle: some View {
Toggle("Honor orientation lock", isOn: $honorSystemOrientationLock)