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

Emit playback speed change event when Android Auto changes speed

Browse source
This commit is contained in:
advplyr 2023-02-06 17:20:39 -06:00
parent 17a894f5ef
commit 405cd21c32
5 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
android/app/src/main/java/com/audiobookshelf/app/media/MediaManager.kt
View file

@ -70,21 +70,22 @@ class MediaManager(private var apiHandler: ApiHandler, var ctx: Context) {
if (userSettingsPref != null) {
try {
val userSettings = JSObject(userSettingsPref)
userSettings.put("playbackRate", newRate.toDouble())
userSettings.put("playbackRate", newRate.toDouble()) // TODO: Handle storing exact values? This actually comes out to something like 2.00000004432
sharedPrefEditor.putString("userSettings", userSettings.toString())
sharedPrefEditor.commit()
sharedPrefEditor.apply()
userSettingsPlaybackRate = newRate
Log.d(tag, "Saved userSettings JSON from Android Auto")
Log.d(tag, "Saved userSettings JSON from Android Auto with playbackRate=$newRate")
} catch(je:JSONException) {
Log.e(tag, "Failed to save userSettings JSON ${je.localizedMessage}")
}
} else {
// Not sure if this is the best place for this, but if a user has not changed any user settings in the app
// the object will not exist yet, could be moved to a centralized place or created on first app load
var userSettings = JSONObject()
val userSettings = JSONObject()
userSettings.put("playbackRate", newRate.toDouble())
sharedPrefEditor.putString("userSettings", userSettings.toString())
Log.d(tag, "Created and saved userSettings JSON from Android Auto")
userSettingsPlaybackRate = newRate
Log.d(tag, "Created and saved userSettings JSON from Android Auto with playbackRate=$newRate")
}
}
}

7
android/app/src/main/java/com/audiobookshelf/app/player/MediaSessionCallback.kt
View file

@ -90,9 +90,9 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
private fun onChangeSpeed() {
// cycle to next speed, only contains preset android app options, as each increment needs it's own icon
var mediaManager = playerNotificationService.mediaManager
var currentSpeed = mediaManager.getSavedPlaybackRate()
var newSpeed = when (currentSpeed) {
val mediaManager = playerNotificationService.mediaManager
val currentSpeed = mediaManager.getSavedPlaybackRate()
val newSpeed = when (currentSpeed) {
0.5f -> 1.0f
1.0f -> 1.2f
1.2f -> 1.5f
@ -104,6 +104,7 @@ class MediaSessionCallback(var playerNotificationService:PlayerNotificationServi
}
mediaManager.setSavedPlaybackRate(newSpeed)
playerNotificationService.setPlaybackSpeed(newSpeed)
playerNotificationService.clientEventEmitter?.onPlaybackSpeedChanged(newSpeed)
}
override fun onPlayFromMediaId(mediaId: String?, extras: Bundle?) {

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

@ -80,6 +80,7 @@ class PlayerNotificationService : MediaBrowserServiceCompat() {
fun onProgressSyncSuccess()
fun onNetworkMeteredChanged(isUnmetered:Boolean)
fun onMediaItemHistoryUpdated(mediaItemHistory:MediaItemHistory)
fun onPlaybackSpeedChanged(playbackSpeed:Float)
}
private val binder = LocalBinder()
@ -1187,6 +1188,8 @@ class PlayerNotificationService : MediaBrowserServiceCompat() {
override fun getCustomAction(player: Player): PlaybackStateCompat.CustomAction? {
val playbackRate = mediaManager.getSavedPlaybackRate()
// TODO: Handle custom playback rates like 0.7, 1.3, 1.4, etc
val drawable: Int = when (playbackRate) {
0.5f -> R.drawable.ic_play_speed_0_5x
1.0f -> R.drawable.ic_play_speed_1_0x

4
android/app/src/main/java/com/audiobookshelf/app/plugins/AbsAudioPlayer.kt
View file

@ -97,6 +97,10 @@ class AbsAudioPlayer : Plugin() {
override fun onMediaItemHistoryUpdated(mediaItemHistory:MediaItemHistory) {
notifyListeners("onMediaItemHistoryUpdated", JSObject(jacksonMapper.writeValueAsString(mediaItemHistory)))
}
override fun onPlaybackSpeedChanged(playbackSpeed:Float) {
emit("onPlaybackSpeedChanged", playbackSpeed)
}
})
MediaEventManager.clientEventEmitter = playerNotificationService.clientEventEmitter