third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-25 21:22:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed scrobbling

Browse Source
This commit is contained in:
Nite 2022-08-30 16:20:05 +02:00
parent e16f964238
commit 74bf995ed6
No known key found for this signature in database
GPG Key ID: 1D1AD59B1C6386C1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerController.kt
View File

@ -14,6 +14,7 @@ import androidx.media3.common.C
import androidx.media3.common.HeartRating import androidx.media3.common.HeartRating
import androidx.media3.common.MediaItem import androidx.media3.common.MediaItem
import androidx.media3.common.Player import androidx.media3.common.Player
import androidx.media3.common.Player.MEDIA_ITEM_TRANSITION_REASON_AUTO
import androidx.media3.common.Player.REPEAT_MODE_OFF import androidx.media3.common.Player.REPEAT_MODE_OFF
import androidx.media3.common.Timeline import androidx.media3.common.Timeline
import androidx.media3.session.MediaController import androidx.media3.session.MediaController
@ -127,6 +128,10 @@ class MediaPlayerController(
override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) { override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
clearBookmark() clearBookmark()
// TRANSITION_REASON_AUTO means that the previous track finished playing and a new one has started.
if (reason == MEDIA_ITEM_TRANSITION_REASON_AUTO && cachedMediaItem != null) {
scrobbler.scrobble(cachedMediaItem?.toTrack(), true)
}
cachedMediaItem = mediaItem cachedMediaItem = mediaItem
publishPlaybackState() publishPlaybackState()
} }
@ -196,7 +201,6 @@ class MediaPlayerController(
} }
private fun playerStateChangedHandler() { private fun playerStateChangedHandler() {
val currentPlaying = controller?.currentMediaItem?.toTrack() ?: return val currentPlaying = controller?.currentMediaItem?.toTrack() ?: return
when (playbackState) { when (playbackState) {
@ -205,6 +209,7 @@ class MediaPlayerController(
scrobbler.scrobble(currentPlaying, false) scrobbler.scrobble(currentPlaying, false)
} }
} }
// STATE_ENDED is only signaled if the whole playlist completes. Scrobble the last song.
Player.STATE_ENDED -> { Player.STATE_ENDED -> {
scrobbler.scrobble(currentPlaying, true) scrobbler.scrobble(currentPlaying, true)
} }