Creepso/Sora
1
0
Fork 0
mirror of https://github.com/cranci1/Sora.git synced 2026-04-21 08:32:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

good right?

Browse source
This commit is contained in:
Francesco 2025-04-17 11:17:43 +02:00
parent 0f85714268
commit 82ff26f073
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Sora/Utils/MediaPlayer/CustomPlayer/CustomPlayer.swift
View file

@ -190,7 +190,6 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
view.backgroundColor = .black view.backgroundColor = .black
setupHoldGesture() setupHoldGesture()
setInitialPlayerRate()
loadSubtitleSettings() loadSubtitleSettings()
setupPlayerViewController() setupPlayerViewController()
setupControls() setupControls()
@ -226,7 +225,6 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
volumeViewModel.value = Double(audioSession.outputVolume) volumeViewModel.value = Double(audioSession.outputVolume)
volumeObserver = audioSession.observe(\.outputVolume, options: [.new]) { [weak self] session, change in volumeObserver = audioSession.observe(\.outputVolume, options: [.new]) { [weak self] session, change in
guard let newVol = change.newValue else { return } guard let newVol = change.newValue else { return }
DispatchQueue.main.async { DispatchQueue.main.async {
@ -240,8 +238,6 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
playerViewController.allowsVideoFrameAnalysis = false playerViewController.allowsVideoFrameAnalysis = false
} }
player.play()
if let url = subtitlesURL, !url.isEmpty { if let url = subtitlesURL, !url.isEmpty {
subtitlesLoader.load(from: url) subtitlesLoader.load(from: url)
} }
@ -293,16 +289,30 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
} }
} }
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
player?.play()
setInitialPlayerRate()
}
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
NotificationCenter.default.addObserver(self, NotificationCenter.default.addObserver(self, selector: #selector(playerItemDidChange), name: .AVPlayerItemNewAccessLogEntry, object: nil)
selector: #selector(playerItemDidChange),
name: .AVPlayerItemNewAccessLogEntry,
object: nil)
skip85Button?.isHidden = !isSkip85Visible skip85Button?.isHidden = !isSkip85Visible
} }
override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
if let playbackSpeed = player?.rate {
UserDefaults.standard.set(playbackSpeed, forKey: "lastPlaybackSpeed")
}
player?.pause()
if let timeObserverToken = timeObserverToken {
player?.removeTimeObserver(timeObserverToken)
self.timeObserverToken = nil
}
}
override func viewWillDisappear(_ animated: Bool) { override func viewWillDisappear(_ animated: Bool) {
super.viewWillDisappear(animated) super.viewWillDisappear(animated)
@ -1098,7 +1108,7 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
let finalSkip = holdValue > 0 ? holdValue : 30 let finalSkip = holdValue > 0 ? holdValue : 30
currentTimeVal = max(currentTimeVal - finalSkip, 0) currentTimeVal = max(currentTimeVal - finalSkip, 0)
player.seek(to: CMTime(seconds: currentTimeVal, preferredTimescale: 600)) { [weak self] finished in player.seek(to: CMTime(seconds: currentTimeVal, preferredTimescale: 600)) { [weak self] finished in
guard let self = self else { return } guard self != nil else { return }
} }
} }
} }
@ -1109,7 +1119,7 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
let finalSkip = holdValue > 0 ? holdValue : 30 let finalSkip = holdValue > 0 ? holdValue : 30
currentTimeVal = min(currentTimeVal + finalSkip, duration) currentTimeVal = min(currentTimeVal + finalSkip, duration)
player.seek(to: CMTime(seconds: currentTimeVal, preferredTimescale: 600)) { [weak self] finished in player.seek(to: CMTime(seconds: currentTimeVal, preferredTimescale: 600)) { [weak self] finished in
guard let self = self else { return } guard self != nil else { return }
} }
} }
} }
@ -1119,7 +1129,7 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
let finalSkip = skipValue > 0 ? skipValue : 10 let finalSkip = skipValue > 0 ? skipValue : 10
currentTimeVal = max(currentTimeVal - finalSkip, 0) currentTimeVal = max(currentTimeVal - finalSkip, 0)
player.seek(to: CMTime(seconds: currentTimeVal, preferredTimescale: 600)) { [weak self] finished in player.seek(to: CMTime(seconds: currentTimeVal, preferredTimescale: 600)) { [weak self] finished in
guard let self = self else { return } guard self != nil else { return }
} }
} }
@ -1128,7 +1138,7 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
let finalSkip = skipValue > 0 ? skipValue : 10 let finalSkip = skipValue > 0 ? skipValue : 10
currentTimeVal = min(currentTimeVal + finalSkip, duration) currentTimeVal = min(currentTimeVal + finalSkip, duration)
player.seek(to: CMTime(seconds: currentTimeVal, preferredTimescale: 600)) { [weak self] finished in player.seek(to: CMTime(seconds: currentTimeVal, preferredTimescale: 600)) { [weak self] finished in
guard let self = self else { return } } guard self != nil else { return } }
} }
@objc func handleDoubleTap(_ gesture: UITapGestureRecognizer) { @objc func handleDoubleTap(_ gesture: UITapGestureRecognizer) {