From f89148b92e3f8b2f2bc929f7b440d859eae3eb0d Mon Sep 17 00:00:00 2001 From: advplyr Date: Sat, 25 Nov 2023 15:03:14 -0600 Subject: [PATCH 1/2] iOS version bump 0.9.68 --- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 6ed6d63a..f0a14554 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -728,12 +728,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = Icons; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 24; + CURRENT_PROJECT_VERSION = 25; DEVELOPMENT_TEAM = 7UFJ7D8V6A; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.9.67; + MARKETING_VERSION = 0.9.68; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.audiobookshelf.app.dev; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -752,12 +752,12 @@ ASSETCATALOG_COMPILER_APPICON_NAME = Icons; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 24; + CURRENT_PROJECT_VERSION = 25; DEVELOPMENT_TEAM = 7UFJ7D8V6A; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.9.67; + MARKETING_VERSION = 0.9.68; PRODUCT_BUNDLE_IDENTIFIER = com.audiobookshelf.app; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; From 59c71b71fbb9124f3cc5dae8ec7734f6bd54ec57 Mon Sep 17 00:00:00 2001 From: Denis Arnst Date: Wed, 29 Nov 2023 17:30:34 +0100 Subject: [PATCH 2/2] Fix track skipping on iOS (Fixes #686) When we seek into a different chapter, we will have to reset the progress of the current one before seeking to the new one. --- ios/App/Shared/player/AudioPlayer.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ios/App/Shared/player/AudioPlayer.swift b/ios/App/Shared/player/AudioPlayer.swift index 877f61a8..665d776c 100644 --- a/ios/App/Shared/player/AudioPlayer.swift +++ b/ios/App/Shared/player/AudioPlayer.swift @@ -371,6 +371,10 @@ class AudioPlayer: NSObject { // Reconstruct queue if seeking to a different track if (self.currentTrackIndex != indexOfSeek) { + // When we seek to a different track, we need to make sure to seek the old track to 0 + // or we will get jumps to the old position when fading over into a new track + self.audioPlayer.seek(to: CMTime(seconds: 0, preferredTimescale: 1000)) + self.currentTrackIndex = indexOfSeek try? playbackSession.update {