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

Fix:Auto rewind and jump forward/jump backward on multi-tracks #143

Browse source
This commit is contained in:
advplyr 2022-04-28 17:19:02 -05:00
parent be885009ad
commit 8411428241
7 changed files with 173 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

21
android/app/src/main/java/com/audiobookshelf/app/player/PlayerListener.kt
View file

@ -66,19 +66,26 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :
Log.d(tag, "EVENT IS PLAYING CHANGED ${playerNotificationService.getMediaPlayer()}")
if (player.isPlaying) {
Log.d(tag, "SeekBackTime: Player is playing")
if (lastPauseTime > 0) {
if (onSeekBack) onSeekBack = false
else {
Log.d(tag, "SeekBackTime: playing started now set seek back time $lastPauseTime")
var backTime = calcPauseSeekBackTime()
if (backTime > 0) {
if (backTime >= playerNotificationService.mPlayer.currentPosition) backTime = playerNotificationService.mPlayer.currentPosition - 500
if (backTime >= playerNotificationService.getCurrentTime()) backTime = playerNotificationService.getCurrentTime() - 500
Log.d(tag, "SeekBackTime $backTime")
onSeekBack = true
playerNotificationService.seekBackward(backTime)
} else {
Log.d(tag, "SeekBackTime: back time is 0")
}
}
}
} else lastPauseTime = System.currentTimeMillis()
} else {
Log.d(tag, "SeekBackTime: Player not playing set last pause time")
lastPauseTime = System.currentTimeMillis()
}
// Start/stop progress sync interval
Log.d(tag, "Playing ${playerNotificationService.getCurrentBookTitle()}")
@ -96,12 +103,10 @@ class PlayerListener(var playerNotificationService:PlayerNotificationService) :
if (lastPauseTime <= 0) return 0
var time: Long = System.currentTimeMillis() - lastPauseTime
var seekback: Long
if (time < 60000) seekback = 0
else if (time < 120000) seekback = 10000
else if (time < 300000) seekback = 15000
else if (time < 1800000) seekback = 20000
else if (time < 3600000) seekback = 25000
else seekback = 29500
if (time < 3000) seekback = 0
else if (time < 300000) seekback = 10000 // 3s to 5m = jump back 10s
else if (time < 1800000) seekback = 20000 // 5m to 30m = jump back 20s
else seekback = 29500 // 30m and up = jump back 30s
return seekback
}
}

6
android/app/src/main/java/com/audiobookshelf/app/player/PlayerNotificationService.kt
View file

@ -509,11 +509,13 @@ class PlayerNotificationService : MediaBrowserServiceCompat() {
}
fun seekForward(amount: Long) {
currentPlayer.seekTo(currentPlayer.currentPosition + amount)
seekPlayer(getCurrentTime() + amount)
// currentPlayer.seekTo(currentPlayer.currentPosition + amount)
}
fun seekBackward(amount: Long) {
currentPlayer.seekTo(currentPlayer.currentPosition - amount)
seekPlayer(getCurrentTime() - amount)
// currentPlayer.seekTo(currentPlayer.currentPosition - amount)
}
fun setPlaybackSpeed(speed: Float) {

2
android/app/src/main/java/com/audiobookshelf/app/plugins/AbsDownloader.kt
View file

@ -330,7 +330,7 @@ class AbsDownloader : Plugin() {
}
}
fun checkDownloads(downloadItem: DownloadItem) {
private fun checkDownloads(downloadItem: DownloadItem) {
val itemParts = downloadItem.downloadItemParts.map { it }
for (downloadItemPart in itemParts) {
if (downloadItemPart.downloadId != null) {