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

Merge branch 'fix_scrobble' into 'develop'

Browse Source 
Fixed scrobbling

Closes #801

See merge request ultrasonic/ultrasonic!812
This commit is contained in:
Nite 2022-08-30 15:15:58 +00:00
commit 37c92a5608
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.MediaItem
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.Timeline
import androidx.media3.session.MediaController
@ -127,6 +128,10 @@ class MediaPlayerController(
override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
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
publishPlaybackState()
}
@ -196,7 +201,6 @@ class MediaPlayerController(
}
private fun playerStateChangedHandler() {
val currentPlaying = controller?.currentMediaItem?.toTrack() ?: return
when (playbackState) {
@ -205,6 +209,7 @@ class MediaPlayerController(
scrobbler.scrobble(currentPlaying, false)
}
}
// STATE_ENDED is only signaled if the whole playlist completes. Scrobble the last song.
Player.STATE_ENDED -> {
scrobbler.scrobble(currentPlaying, true)
}