mirror of
https://github.com/yattee/yattee.git
synced 2024-12-22 21:43:41 +00:00
move AVAudioSession configuration to AppDelegate
Signed-off-by: Toni Förster <toni.foerster@gmail.com>
This commit is contained in:
parent
a194738bb6
commit
1a22ac71be
@ -102,7 +102,7 @@ final class AVPlayerBackend: PlayerBackend {
|
|||||||
|
|
||||||
private var frequentTimeObserver: Any?
|
private var frequentTimeObserver: Any?
|
||||||
private var infrequentTimeObserver: Any?
|
private var infrequentTimeObserver: Any?
|
||||||
private var playerTimeControlStatusObserver: Any?
|
private var playerTimeControlStatusObserver: NSKeyValueObservation?
|
||||||
|
|
||||||
private var statusObservation: NSKeyValueObservation?
|
private var statusObservation: NSKeyValueObservation?
|
||||||
|
|
||||||
@ -119,6 +119,26 @@ final class AVPlayerBackend: PlayerBackend {
|
|||||||
#if os(iOS)
|
#if os(iOS)
|
||||||
controller.player = avPlayer
|
controller.player = avPlayer
|
||||||
#endif
|
#endif
|
||||||
|
logger.info("AVPlayerBackend initialized.")
|
||||||
|
}
|
||||||
|
|
||||||
|
deinit {
|
||||||
|
// Invalidate any observers to avoid memory leaks
|
||||||
|
statusObservation?.invalidate()
|
||||||
|
playerTimeControlStatusObserver?.invalidate()
|
||||||
|
|
||||||
|
// Remove any time observers added to AVPlayer
|
||||||
|
if let frequentObserver = frequentTimeObserver {
|
||||||
|
avPlayer.removeTimeObserver(frequentObserver)
|
||||||
|
}
|
||||||
|
if let infrequentObserver = infrequentTimeObserver {
|
||||||
|
avPlayer.removeTimeObserver(infrequentObserver)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove notification observers
|
||||||
|
removeItemDidPlayToEndTimeObserver()
|
||||||
|
|
||||||
|
logger.info("AVPlayerBackend deinitialized.")
|
||||||
}
|
}
|
||||||
|
|
||||||
func canPlay(_ stream: Stream) -> Bool {
|
func canPlay(_ stream: Stream) -> Bool {
|
||||||
@ -342,11 +362,8 @@ final class AVPlayerBackend: PlayerBackend {
|
|||||||
self.asset = nil
|
self.asset = nil
|
||||||
}
|
}
|
||||||
|
|
||||||
let startPlaying = {
|
|
||||||
#if !os(macOS)
|
|
||||||
try? AVAudioSession.sharedInstance().setActive(true)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
let startPlaying = {
|
||||||
self.setRate(self.model.currentRate)
|
self.setRate(self.model.currentRate)
|
||||||
|
|
||||||
guard let item = self.model.playerItem, self.isAutoplaying(item) else { return }
|
guard let item = self.model.playerItem, self.isAutoplaying(item) else { return }
|
||||||
@ -779,7 +796,7 @@ final class AVPlayerBackend: PlayerBackend {
|
|||||||
opened = true
|
opened = true
|
||||||
controller.startPictureInPicture()
|
controller.startPictureInPicture()
|
||||||
} else {
|
} else {
|
||||||
print("PiP not possible, waited \(delay) seconds")
|
self.logger.info("PiP not possible, waited \(delay) seconds")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -245,21 +245,6 @@ final class MPVBackend: PlayerBackend {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let startPlaying = {
|
let startPlaying = {
|
||||||
#if !os(macOS)
|
|
||||||
do {
|
|
||||||
try AVAudioSession.sharedInstance().setActive(true)
|
|
||||||
|
|
||||||
NotificationCenter.default.addObserver(
|
|
||||||
self,
|
|
||||||
selector: #selector(self.handleAudioSessionInterruption(_:)),
|
|
||||||
name: AVAudioSession.interruptionNotification,
|
|
||||||
object: nil
|
|
||||||
)
|
|
||||||
} catch {
|
|
||||||
self.logger.error("Error setting up audio session: \(error)")
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
DispatchQueue.main.async { [weak self] in
|
DispatchQueue.main.async { [weak self] in
|
||||||
guard let self else {
|
guard let self else {
|
||||||
return
|
return
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
|
import AVFoundation
|
||||||
import Foundation
|
import Foundation
|
||||||
|
import Logging
|
||||||
import UIKit
|
import UIKit
|
||||||
|
|
||||||
final class AppDelegate: UIResponder, UIApplicationDelegate {
|
final class AppDelegate: UIResponder, UIApplicationDelegate {
|
||||||
var orientationLock = UIInterfaceOrientationMask.all
|
var orientationLock = UIInterfaceOrientationMask.all
|
||||||
|
|
||||||
|
private var logger = Logger(label: "stream.yattee.app.delegalate")
|
||||||
private(set) static var instance: AppDelegate!
|
private(set) static var instance: AppDelegate!
|
||||||
|
|
||||||
func application(_: UIApplication, supportedInterfaceOrientationsFor _: UIWindow?) -> UIInterfaceOrientationMask {
|
func application(_: UIApplication, supportedInterfaceOrientationsFor _: UIWindow?) -> UIInterfaceOrientationMask {
|
||||||
@ -12,11 +15,23 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
|
|||||||
|
|
||||||
func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { // swiftlint:disable:this discouraged_optional_collection
|
func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { // swiftlint:disable:this discouraged_optional_collection
|
||||||
Self.instance = self
|
Self.instance = self
|
||||||
#if os(iOS)
|
|
||||||
UIViewController.swizzleHomeIndicatorProperty()
|
|
||||||
|
|
||||||
|
#if !os(macOS)
|
||||||
|
UIViewController.swizzleHomeIndicatorProperty()
|
||||||
OrientationTracker.shared.startDeviceOrientationTracking()
|
OrientationTracker.shared.startDeviceOrientationTracking()
|
||||||
|
|
||||||
|
// Configure the audio session for playback
|
||||||
|
do {
|
||||||
|
try AVAudioSession.sharedInstance().setCategory(.playback, mode: .moviePlayback)
|
||||||
|
try AVAudioSession.sharedInstance().setActive(true)
|
||||||
|
} catch {
|
||||||
|
logger.error("Failed to set audio session category: \(error)")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Begin receiving remote control events
|
||||||
|
UIApplication.shared.beginReceivingRemoteControlEvents()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user