mirror of
https://github.com/yattee/yattee.git
synced 2024-12-22 21:43:41 +00:00
Merge pull request #772 from stonerl/re-enter-fullscreen-on-background-return
fixed fullscreen handling for backgrounding
This commit is contained in:
commit
e749307a0e
@ -56,6 +56,7 @@ final class PlayerModel: ObservableObject {
|
|||||||
@Published var presentingPlayer = false { didSet { handlePresentationChange() } }
|
@Published var presentingPlayer = false { didSet { handlePresentationChange() } }
|
||||||
@Published var activeBackend = PlayerBackendType.mpv
|
@Published var activeBackend = PlayerBackendType.mpv
|
||||||
@Published var forceBackendOnPlay: PlayerBackendType?
|
@Published var forceBackendOnPlay: PlayerBackendType?
|
||||||
|
@Published var wasFullscreen = false
|
||||||
|
|
||||||
var avPlayerBackend = AVPlayerBackend()
|
var avPlayerBackend = AVPlayerBackend()
|
||||||
var mpvBackend = MPVBackend()
|
var mpvBackend = MPVBackend()
|
||||||
@ -979,6 +980,17 @@ final class PlayerModel: ObservableObject {
|
|||||||
avPlayerBackend.bindPlayerToLayer()
|
avPlayerBackend.bindPlayerToLayer()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if os(iOS)
|
||||||
|
if wasFullscreen {
|
||||||
|
wasFullscreen = false
|
||||||
|
DispatchQueue.main.async { [weak self] in
|
||||||
|
Delay.by(0.3) {
|
||||||
|
self?.enterFullScreen()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
guard closePiPAndOpenPlayerOnEnteringForeground, playingInPictureInPicture else {
|
guard closePiPAndOpenPlayerOnEnteringForeground, playingInPictureInPicture else {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -993,6 +1005,15 @@ final class PlayerModel: ObservableObject {
|
|||||||
} else if !playingInPictureInPicture {
|
} else if !playingInPictureInPicture {
|
||||||
avPlayerBackend.removePlayerFromLayer()
|
avPlayerBackend.removePlayerFromLayer()
|
||||||
}
|
}
|
||||||
|
#if os(iOS)
|
||||||
|
guard playingFullScreen else { return }
|
||||||
|
wasFullscreen = playingFullScreen
|
||||||
|
DispatchQueue.main.async { [weak self] in
|
||||||
|
Delay.by(0.3) {
|
||||||
|
self?.exitFullScreen(showControls: false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user