mirror/advplyr.audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2025-08-04 10:04:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix race conditions on first launch

Browse source
This commit is contained in:
ronaldheft 2022-08-18 19:31:32 -04:00
parent af835f2c43
commit bf46c46fc0
4 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ios/App/App/plugins/AbsAudioPlayer.swift
View file

@ -12,6 +12,7 @@ import RealmSwift
@objc(AbsAudioPlayer)
public class AbsAudioPlayer: CAPPlugin {
private var initialPlayWhenReady = false
private var isUIReady = false
override public func load() {
NotificationCenter.default.addObserver(self, selector: #selector(sendMetadata), name: NSNotification.Name(PlayerEvents.update.rawValue), object: nil)
@ -22,15 +23,21 @@ public class AbsAudioPlayer: CAPPlugin {
NotificationCenter.default.addObserver(self, selector: #selector(sendSleepTimerEnded), name: NSNotification.Name(PlayerEvents.sleepEnded.rawValue), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(onPlaybackFailed), name: NSNotification.Name(PlayerEvents.failed.rawValue), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(onLocalMediaProgressUpdate), name: NSNotification.Name(PlayerEvents.localProgress.rawValue), object: nil)
// Restore the playack session when plugin loads
Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(restorePlaybackSession), userInfo: nil, repeats: false)
NotificationCenter.default.addObserver(self, selector: #selector(userInterfaceReady), name: NSNotification.Name(PlayerEvents.playerUserInterfaceReady.rawValue), object: nil)
self.bridge?.webView?.allowsBackForwardNavigationGestures = true;
}
@objc func restorePlaybackSession() {
@objc func userInterfaceReady() {
if !self.isUIReady {
NSLog("User interface is ready. Performing state restore...")
self.restorePlaybackSession()
self.isUIReady = true
}
}
func restorePlaybackSession() {
// We don't need to restore if we have an active session
guard PlayerHandler.getPlaybackSession() == nil else { return }

4
ios/App/App/plugins/AbsDatabase.swift
View file

@ -155,6 +155,10 @@ public class AbsDatabase: CAPPlugin {
call.reject("Failed to report synced media progress")
}
}
// If we're syncing progress with the server, we also have the UI ready
// This will restore the player to the last playback session
NotificationCenter.default.post(name: NSNotification.Name(PlayerEvents.playerUserInterfaceReady.rawValue), object: nil)
}
@objc func syncServerMediaProgressWithLocalMediaProgress(_ call: CAPPluginCall) {

6
ios/App/Shared/player/AudioPlayer.swift
View file

@ -261,6 +261,12 @@ class AudioPlayer: NSObject {
}
public func setPlaybackRate(_ rate: Float, observed: Bool = false) {
// Handle a race condition on first launch
guard self.status != -1 else {
NSLog("Did not set playback rate as player is not initialized")
return
}
if self.audioPlayer.rate != rate {
NSLog("setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)")
self.audioPlayer.rate = rate

1
ios/App/Shared/util/PlayerEvents.swift
View file

@ -14,4 +14,5 @@ enum PlayerEvents: String {
case sleepEnded = "com.audiobookshelf.app.player.sleep.ended"
case failed = "com.audiobookshelf.app.player.failed"
case localProgress = "com.audiobookshelf.app.player.localProgress"
case playerUserInterfaceReady = "com.audiobookshelf.app.player.playerUserInterfaceReady"
}