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

Fixed crash

Browse source
This commit is contained in:
Rasmus Krämer 2022-05-03 15:01:30 +02:00
parent 9a81fc3688
commit 0708133779
No known key found for this signature in database
GPG key ID: EC9E510611BFDAA2
4 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ios/App/App/plugins/AbsAudioPlayer.m
View file

@ -14,9 +14,9 @@ CAP_PLUGIN(AbsAudioPlayer, "AbsAudioPlayer",
CAP_PLUGIN_METHOD(setPlaybackSpeed, CAPPluginReturnPromise); CAP_PLUGIN_METHOD(setPlaybackSpeed, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(playPause, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(playPlayer, CAPPluginReturnPromise); CAP_PLUGIN_METHOD(playPlayer, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(pausePlayer, CAPPluginReturnPromise); CAP_PLUGIN_METHOD(pausePlayer, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(playPause, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(seek, CAPPluginReturnPromise); CAP_PLUGIN_METHOD(seek, CAPPluginReturnPromise);
CAP_PLUGIN_METHOD(seekForward, CAPPluginReturnPromise); CAP_PLUGIN_METHOD(seekForward, CAPPluginReturnPromise);

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

@ -71,10 +71,6 @@ public class AbsAudioPlayer: CAPPlugin {
call.resolve() call.resolve()
} }
@objc func playPause(_ call: CAPPluginCall) {
PlayerHandler.paused = !PlayerHandler.paused
call.resolve([ "playing": !PlayerHandler.paused ])
}
@objc func playPlayer(_ call: CAPPluginCall) { @objc func playPlayer(_ call: CAPPluginCall) {
PlayerHandler.paused = false PlayerHandler.paused = false
call.resolve() call.resolve()
@ -83,6 +79,11 @@ public class AbsAudioPlayer: CAPPlugin {
PlayerHandler.paused = true PlayerHandler.paused = true
call.resolve() call.resolve()
} }
// I have no clue why but after i moved this block of code from above "playPlayer" to here the app stopped crashing. Move it back up if you want to
@objc func playPause(_ call: CAPPluginCall) {
PlayerHandler.paused = !PlayerHandler.paused
call.resolve([ "playing": !PlayerHandler.paused ])
}
@objc func seek(_ call: CAPPluginCall) { @objc func seek(_ call: CAPPluginCall) {
PlayerHandler.seek(amount: call.getDouble("value", 0.0)) PlayerHandler.seek(amount: call.getDouble("value", 0.0))

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

@ -186,7 +186,7 @@ class AudioPlayer: NSObject {
lastPlayTime = Date.timeIntervalSinceReferenceDate lastPlayTime = Date.timeIntervalSinceReferenceDate
} }
public func seek(_ to: Double, from:String) { public func seek(_ to: Double, from: String) {
let continuePlaying = rate > 0.0 let continuePlaying = rate > 0.0
pause() pause()

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

@ -36,7 +36,11 @@ class PlayerHandler {
public static var paused: Bool { public static var paused: Bool {
get { get {
return player?.rate == 0.0 guard let player = player else {
return true
}
return player.rate == 0.0
} }
set(paused) { set(paused) {
if paused { if paused {