starred/audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2026-08-29 22:57:16 +02:00
Code Issues 454 Packages Projects Releases 10 Wiki Activity

Audio player modifications should be on main queue

Browse Source
This commit is contained in:
ronaldheft
2022-09-13 20:47:07 -04:00
parent 713999eb83
commit 7294bc7033
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ios/App/Shared/player/AudioPlayer.swift
+31 -18
View File
@@ -299,9 +299,12 @@ class AudioPlayer: NSObject {
// Start playback, with a seek, for as smooth a scrub bar start as possible // Start playback, with a seek, for as smooth a scrub bar start as possible
let currentTrackStartOffset = session.audioTracks[self.currentTrackIndex].startOffset ?? 0.0 let currentTrackStartOffset = session.audioTracks[self.currentTrackIndex].startOffset ?? 0.0
let seekTime = currentTime - currentTrackStartOffset let seekTime = currentTime - currentTrackStartOffset
self.audioPlayer.seek(to: CMTime(seconds: seekTime, preferredTimescale: 1000), toleranceBefore: .zero, toleranceAfter: .zero) { [weak self] completed in
guard completed else { return } DispatchQueue.runOnMainQueue {
self?.resumePlayback() self.audioPlayer.seek(to: CMTime(seconds: seekTime, preferredTimescale: 1000), toleranceBefore: .zero, toleranceAfter: .zero) { [weak self] completed in
guard completed else { return }
self?.resumePlayback()
}
} }
} }
@@ -337,8 +340,10 @@ class AudioPlayer: NSObject {
self.stopPausedTimer() self.stopPausedTimer()
self.markAudioSessionAs(active: true) self.markAudioSessionAs(active: true)
self.audioPlayer.play() DispatchQueue.runOnMainQueue {
self.audioPlayer.rate = self.tmpRate self.audioPlayer.play()
self.audioPlayer.rate = self.tmpRate
}
self.status = 1 self.status = 1
// Update the progress // Update the progress
@@ -349,7 +354,9 @@ class AudioPlayer: NSObject {
guard self.isInitialized() else { return } guard self.isInitialized() else { return }
NSLog("PAUSE: Pausing playback") NSLog("PAUSE: Pausing playback")
self.audioPlayer.pause() DispatchQueue.runOnMainQueue {
self.audioPlayer.pause()
}
self.markAudioSessionAs(active: false) self.markAudioSessionAs(active: false)
Task { Task {
@@ -394,9 +401,11 @@ class AudioPlayer: NSObject {
self.status = -1 self.status = -1
let playerItems = self.allPlayerItems[indexOfSeek..<self.allPlayerItems.count] let playerItems = self.allPlayerItems[indexOfSeek..<self.allPlayerItems.count]
self.audioPlayer.removeAllItems() DispatchQueue.runOnMainQueue {
for item in Array(playerItems) { self.audioPlayer.removeAllItems()
self.audioPlayer.insert(item, after:self.audioPlayer.items().last) for item in Array(playerItems) {
self.audioPlayer.insert(item, after:self.audioPlayer.items().last)
}
} }
setupQueueItemStatusObserver() setupQueueItemStatusObserver()
@@ -405,15 +414,17 @@ class AudioPlayer: NSObject {
let currentTrackStartOffset = playbackSession.audioTracks[self.currentTrackIndex].startOffset ?? 0.0 let currentTrackStartOffset = playbackSession.audioTracks[self.currentTrackIndex].startOffset ?? 0.0
let seekTime = to - currentTrackStartOffset let seekTime = to - currentTrackStartOffset
self.audioPlayer.seek(to: CMTime(seconds: seekTime, preferredTimescale: 1000)) { [weak self] completed in DispatchQueue.runOnMainQueue {
guard completed else { return NSLog("SEEK: WARNING: seeking not completed (to \(seekTime)") } self.audioPlayer.seek(to: CMTime(seconds: seekTime, preferredTimescale: 1000)) { [weak self] completed in
guard let self = self else { return } guard completed else { return NSLog("SEEK: WARNING: seeking not completed (to \(seekTime)") }
guard let self = self else { return }
if continuePlaying {
self.resumePlayback() if continuePlaying {
self.resumePlayback()
}
self.updateNowPlaying()
} }
self.updateNowPlaying()
} }
} }
} }
@@ -423,7 +434,9 @@ class AudioPlayer: NSObject {
if self.audioPlayer.rate != rate { if self.audioPlayer.rate != rate {
NSLog("setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)") NSLog("setPlaybakRate rate changed from \(self.audioPlayer.rate) to \(rate)")
self.audioPlayer.rate = rate DispatchQueue.runOnMainQueue {
self.audioPlayer.rate = rate
}
} }
self.rate = rate self.rate = rate