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

ok yeah im done bro 😭

Browse source
This commit is contained in:
Francesco 2025-06-08 11:56:05 +02:00
parent 728b7a0d45
commit aa886ba17c
1 changed files with 35 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2144,6 +2144,9 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
let currentTime = player.currentTime() let currentTime = player.currentTime()
let wasPlaying = player.rate > 0 let wasPlaying = player.rate > 0
let audioTrackToApply = lastSelectedAudioTrack
player.pause()
var request = URLRequest(url: url) var request = URLRequest(url: url)
if let mydict = headers, !mydict.isEmpty { if let mydict = headers, !mydict.isEmpty {
@ -2159,36 +2162,40 @@ class CustomMediaPlayerViewController: UIViewController, UIGestureRecognizerDele
let asset = AVURLAsset(url: url, options: ["AVURLAssetHTTPHeaderFieldsKey": request.allHTTPHeaderFields ?? [:]]) let asset = AVURLAsset(url: url, options: ["AVURLAssetHTTPHeaderFieldsKey": request.allHTTPHeaderFields ?? [:]])
let playerItem = AVPlayerItem(asset: asset) let playerItem = AVPlayerItem(asset: asset)
let audioTrackToApply = lastSelectedAudioTrack asset.loadValuesAsynchronously(forKeys: ["playable"]) { [weak self] in
let observer = playerItem.observe(\.status, options: [.new]) { [weak self] item, _ in DispatchQueue.main.async {
guard let self = self else { return } guard let self = self else { return }
if item.status == .readyToPlay { let observer = playerItem.observe(\.status, options: [.new]) { [weak self] item, _ in
if let audioTrackName = audioTrackToApply, guard let self = self else { return }
let group = item.asset.mediaSelectionGroup(forMediaCharacteristic: .audible),
let option = group.options.first(where: { $0.displayName == audioTrackName }) { if item.status == .readyToPlay {
playerItem.select(option, in: group) if let audioTrackName = audioTrackToApply,
let group = item.asset.mediaSelectionGroup(forMediaCharacteristic: .audible),
let option = group.options.first(where: { $0.displayName == audioTrackName }) {
item.select(option, in: group)
}
self.player.seek(to: currentTime)
if wasPlaying {
self.player.play()
}
}
}
self.player.replaceCurrentItem(with: playerItem)
self.currentQualityURL = url
UserDefaults.standard.set(urlString, forKey: "lastSelectedQuality")
self.qualityButton.menu = self.qualitySelectionMenu()
if let selectedQuality = self.qualities.first(where: { $0.1 == urlString })?.0 {
DropManager.shared.showDrop(title: "Quality: \(selectedQuality)", subtitle: "", duration: 0.5, icon: UIImage(systemName: "eye"))
}
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
observer.invalidate()
} }
} }
} }
player.replaceCurrentItem(with: playerItem)
player.seek(to: currentTime)
if wasPlaying {
player.play()
}
currentQualityURL = url
UserDefaults.standard.set(urlString, forKey: "lastSelectedQuality")
qualityButton.menu = qualitySelectionMenu()
if let selectedQuality = qualities.first(where: { $0.1 == urlString })?.0 {
DropManager.shared.showDrop(title: "Quality: \(selectedQuality)", subtitle: "", duration: 0.5, icon: UIImage(systemName: "eye"))
}
DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) {
observer.invalidate()
}
} }
private func qualitySelectionMenu() -> UIMenu { private func qualitySelectionMenu() -> UIMenu {
@ -2687,7 +2694,7 @@ extension CustomMediaPlayerViewController: AVPictureInPictureControllerDelegate
pipButton.alpha = 1.0 pipButton.alpha = 1.0
} }
func pictureInPictureController(_ pipController: AVPictureInPictureController, failedToStartPictureInPictureWithError error: Error) { func pictureInPictureController(_ pipController: AVPictureInPictureController, failed toStartPictureInPictureWithError error: Error) {
Logger.shared.log("PiP failed to start: \(error.localizedDescription)", type: "Error") Logger.shared.log("PiP failed to start: \(error.localizedDescription)", type: "Error")
} }
} }