Native Android client for Spotify, built with Jetpack Compose
Kotlin ad-freeadblockandroidjetpack-composekotlinlyricsmusic-playermusic-videomyspotispotifyspotify-adblockerspotify-clientspotify-connectspotui
Repeat one on extension songs restarts at 0:00 (ExoPlayer's own repeat replayed the stream from the last seek): the app replays the song at its end, the Spotify copy plays it again from 0, automatic moves past a song's start are put back, every jump the player makes on its own is logged
kota-zo5bf5858208dc
diff --git a/base/app/src/main/java/com/music/spotui/di/ConnectMirror.kt b/base/app/src/main/java/com/music/spotui/di/ConnectMirror.ktindex 755940d0..62644ba3 100644--- a/base/app/src/main/java/com/music/spotui/di/ConnectMirror.kt+++ b/base/app/src/main/java/com/music/spotui/di/ConnectMirror.kt@@ -171,6 +171,17 @@ object ConnectMirror {}}+ /**+ * The local player played its song again from 0:00 (repeat): the page plays it anew too, a new+ * play as Spotify's own repeat counts one (a seek back to 0 would go on with the same play).+ */+ fun onLocalRepeat() {+ if (!running || page.playsElsewhere.value) return+ val uri = localUri ?: return+ if (want?.uri != uri) return+ start(uri, 0L)+ }+/** A state of the page while the mirror runs (SongPlayer.engineWhileLocal): a remote command, or our own echo. */fun onWeb(s: PlayerState) {val w = want ?: returndiff --git a/base/app/src/main/java/com/music/spotui/di/LocalPlayer.kt b/base/app/src/main/java/com/music/spotui/di/LocalPlayer.ktindex 16e94859..4e45b3a0 100644--- a/base/app/src/main/java/com/music/spotui/di/LocalPlayer.kt+++ b/base/app/src/main/java/com/music/spotui/di/LocalPlayer.kt@@ -82,14 +82,24 @@ object LocalPlayer {// Casting: this player keeps the queue only, stopped; the song plays on the device.if (CastPlayback.active && state != Player.STATE_IDLE) { p.stop(); return }if (state == Player.STATE_READY) checkLength(p)- if (state == Player.STATE_ENDED) atEnd(p)+ if (state == Player.STATE_ENDED && !playAgain(p)) atEnd(p)}override fun onPlayWhenReadyChanged(playWhenReady: Boolean, reason: Int) {log("playWhenReady $playWhenReady (${PLAY_WHEN_READY_REASONS.getOrElse(reason - 1) { "reason $reason" }})")+ // A song on repeat paused at its end (see LocalRepeat): it starts again at 0:00.+ if (reason == Player.PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM && playAgain(p)) return// A pause (or a lost focus) during a fade stops the fading-out song too.outgoing?.playWhenReady = playWhenReadyif (playWhenReady && CastPlayback.active) { p.pause(); CastPlayback.play() }}+ // Moves the player makes by itself (not a seek, not a song's end): logged, so a song+ // jumping elsewhere shows where it went and why.+ override fun onPositionDiscontinuity(old: Player.PositionInfo, new: Player.PositionInfo, reason: Int) {+ if (reason == Player.DISCONTINUITY_REASON_SEEK || reason == Player.DISCONTINUITY_REASON_AUTO_TRANSITION) return+ log("moved by the player from ${old.positionMs} to ${new.positionMs} ms (reason $reason), item ${new.mediaItemIndex + 1}")+ }+ // The queue grew or shrank: a queue of one song repeated loops it as repeat one does.+ override fun onTimelineChanged(timeline: androidx.media3.common.Timeline, reason: Int) = applyRepeat(p)override fun onIsPlayingChanged(isPlaying: Boolean) {log("isPlaying $isPlaying at ${p.currentPosition} ms")if (isPlaying) errors.played()@@ -104,6 +114,7 @@ object LocalPlayer {override fun onMediaItemTransition(mediaItem: androidx.media3.common.MediaItem?, reason: Int) {// Anything but the transition the fade itself makes (a skip, a tap in the queue) ends the fade.if (!startingFade) endFade()+ if (reason == Player.MEDIA_ITEM_TRANSITION_REASON_AUTO || reason == Player.MEDIA_ITEM_TRANSITION_REASON_REPEAT) startsAtZero(p)prefetchNext(p); continueIfLast(p)}@@ -284,7 +295,7 @@ object LocalPlayer {}private fun canFade(p: ExoPlayer): Boolean =- CrossfadePref.seconds > 0 && p.repeatMode != Player.REPEAT_MODE_ONE && p.nextMediaItemIndex != C.INDEX_UNSET &&+ CrossfadePref.seconds > 0 && !LocalRepeat.loopsSong(repeat, p.mediaItemCount) && p.nextMediaItemIndex != C.INDEX_UNSET &&p.currentMediaItem != null && p.playWhenReady && !CastPlayback.activeprivate fun beginFade(p: ExoPlayer) {@@ -381,6 +392,8 @@ object LocalPlayer {endFade()exo?.let {if (it.hasNextMediaItem()) { com.music.spotui.extensions.Extensions.skipAsked("forward"); it.seekToNextMediaItem() }+ // A queue of one song repeated (see LocalRepeat): Next plays it again, as the queue's wrap would.+ else if (repeat == LocalRepeat.ALL) { com.music.spotui.extensions.Extensions.skipAsked("forward"); it.seekTo(0, 0L) }else if (atEnd(it)) com.music.spotui.extensions.Extensions.skipAsked("forward")}}@@ -562,7 +575,7 @@ object LocalPlayer {if (p.mediaItemCount == 0 || p.currentMediaItemIndex != p.mediaItemCount - 1) returnval id = spotifyId(current())if (id == radioOf || !com.music.spotui.extensions.AudioRoute.continues(continues, id,- repeatAll = p.repeatMode == Player.REPEAT_MODE_ALL, autoplay = com.music.spotui.data.preferences.AutoplayPref.on)) return+ repeatAll = repeat == LocalRepeat.ALL, autoplay = com.music.spotui.data.preferences.AutoplayPref.on)) returnforgetRadio(); radioOf = idradio = prefetch.launch {val songs = runCatching { Graph.api.getRecommendations(listOf(id)) }.getOrDefault(emptyList())@@ -610,8 +623,51 @@ object LocalPlayer {private fun item(t: LocalTrack) = MediaItem.Builder().setUri(t.uri).setMediaId(t.id.toString()).setMediaMetadata(MediaMetadata.Builder().setTitle(t.title).setArtist(t.artist).setAlbumTitle(t.album).setArtworkUri(android.net.Uri.parse(app.myspoti.host.android.Covers.large(t.artUri.toString()))).setDurationMs(t.durationMs.takeIf { it > 0 }).build()).build()+ /** SongPlayer.repeatMode as this player has it (0 off, 1 the queue, 2 the song; see LocalRepeat). */+ private var repeat = LocalRepeat.OFF+fun setRepeatMode(mode: Int) {- exo?.repeatMode = when (mode) { 1 -> Player.REPEAT_MODE_ALL; 2 -> Player.REPEAT_MODE_ONE; else -> Player.REPEAT_MODE_OFF }+ repeat = mode+ exo?.let(::applyRepeat)+ }++ /**+ * ExoPlayer repeats a queue of several songs itself; a song that follows itself (repeat one, a+ * queue of one song repeated) pauses at its end and is played again by [playAgain].+ */+ private fun applyRepeat(p: ExoPlayer) {+ p.repeatMode = LocalRepeat.playerMode(repeat, p.mediaItemCount)+ p.pauseAtEndOfMediaItems = LocalRepeat.loopsSong(repeat, p.mediaItemCount)+ }++ /**+ * A song on repeat that reached its end plays again from 0:00, and the Connect mirror's copy+ * plays it anew (a new play, as Spotify's repeat counts one). False: the song does not loop.+ */+ private fun playAgain(p: ExoPlayer): Boolean {+ if (CastPlayback.active || !active.value || !LocalRepeat.loopsSong(repeat, p.mediaItemCount)) return false+ // Already played again: the pause at the end and the end of the last song come together.+ if (p.playWhenReady && p.playbackState != Player.STATE_ENDED) return true+ val ended = p.currentPosition+ endFade()+ p.seekTo(p.currentMediaItemIndex, 0L)+ p.play()+ log("repeat: ${current()?.title} plays again from ${p.currentPosition} ms (it ended at $ended ms)")+ ConnectMirror.onLocalRepeat()+ return true+ }++ /**+ * A song the player moved to by itself (the next one, or the queue starting again on repeat)+ * starts at 0:00: put back there if the player put it elsewhere. The queue starting again is logged.+ */+ private fun startsAtZero(p: ExoPlayer) {+ val at = p.currentPosition+ if (p.currentMediaItemIndex == 0 && p.mediaItemCount > 1 && repeat == LocalRepeat.ALL)+ log("repeat: the queue plays again from ${current()?.title} at $at ms")+ if (!LocalRepeat.startedLate(at)) return+ log("${current()?.title} started at $at ms, not at its start: moved to 0 ms")+ p.seekTo(0L)}/** The Spotify id of [t]: a downloaded song's, or the song an extension streams; "" for the phone's own files. */fun spotifyIdOf(t: LocalTrack): String =@@ -711,7 +767,7 @@ object LocalPlayer {internal fun castFinished() {val p = exo ?: returnwhen {- p.repeatMode == Player.REPEAT_MODE_ONE -> CastPlayback.replay()+ LocalRepeat.loopsSong(repeat, p.mediaItemCount) -> CastPlayback.replay()p.hasNextMediaItem() -> {val before = current()p.seekToNextMediaItem()diff --git a/base/app/src/main/java/com/music/spotui/di/LocalRepeat.kt b/base/app/src/main/java/com/music/spotui/di/LocalRepeat.ktnew file mode 100644index 00000000..ec49b4e2--- /dev/null+++ b/base/app/src/main/java/com/music/spotui/di/LocalRepeat.kt@@ -0,0 +1,30 @@+package com.music.spotui.di++/**+ * How [LocalPlayer] repeats, kept pure so it is tested off-device. [mode] is SongPlayer.repeatMode:+ * 0 off, 1 the queue, 2 the song.+ *+ * A song that follows itself (repeat one, or a queue of one song repeated) is not left to+ * ExoPlayer's own repeat: that plays the song again as a new period of the same item, and with an+ * extension's stream it was seen starting again near the last seek instead of at 0:00 (and earlier+ * on each loop). The player pauses at the song's end instead and Myspoti puts it back at 0:00.+ */+object LocalRepeat {+ const val OFF = 0+ const val ALL = 1+ const val ONE = 2++ /** The song plays again at its end, put back at 0:00 by Myspoti (see the object's note). */+ fun loopsSong(mode: Int, items: Int): Boolean = mode == ONE || mode == ALL && items == 1++ /** The repeat ExoPlayer is given: its own only for a queue of several songs repeated. */+ fun playerMode(mode: Int, items: Int): Int =+ if (mode == ALL && !loopsSong(mode, items)) androidx.media3.common.Player.REPEAT_MODE_ALL+ else androidx.media3.common.Player.REPEAT_MODE_OFF++ /** How far into a song the player may report it at the start (a song starting plays from 0:00). */+ const val START_SLACK_MS = 1_500L++ /** A song the player moved to by itself (the next one, the queue again) that did not start at 0:00. */+ fun startedLate(positionMs: Long): Boolean = positionMs > START_SLACK_MS+}diff --git a/base/app/src/test/java/com/music/spotui/di/LocalRepeatTest.kt b/base/app/src/test/java/com/music/spotui/di/LocalRepeatTest.ktnew file mode 100644index 00000000..c9defa8d--- /dev/null+++ b/base/app/src/test/java/com/music/spotui/di/LocalRepeatTest.kt@@ -0,0 +1,40 @@+package com.music.spotui.di++import androidx.media3.common.Player+import org.junit.Assert.assertEquals+import org.junit.Assert.assertFalse+import org.junit.Assert.assertTrue+import org.junit.Test++class LocalRepeatTest {+ @Test fun repeatOneLoopsTheSongItself() {+ assertTrue(LocalRepeat.loopsSong(LocalRepeat.ONE, 50))+ assertTrue(LocalRepeat.loopsSong(LocalRepeat.ONE, 1))+ // ExoPlayer's REPEAT_MODE_ONE is never used: it restarted extension songs near the last seek.+ assertEquals(Player.REPEAT_MODE_OFF, LocalRepeat.playerMode(LocalRepeat.ONE, 50))+ assertEquals(Player.REPEAT_MODE_OFF, LocalRepeat.playerMode(LocalRepeat.ONE, 1))+ }++ @Test fun repeatAllOfSeveralSongsIsThePlayersOwn() {+ assertFalse(LocalRepeat.loopsSong(LocalRepeat.ALL, 2))+ assertEquals(Player.REPEAT_MODE_ALL, LocalRepeat.playerMode(LocalRepeat.ALL, 50))+ }++ @Test fun repeatAllOfOneSongLoopsItLikeRepeatOne() {+ assertTrue(LocalRepeat.loopsSong(LocalRepeat.ALL, 1))+ assertEquals(Player.REPEAT_MODE_OFF, LocalRepeat.playerMode(LocalRepeat.ALL, 1))+ }++ @Test fun offNeverLoops() {+ assertFalse(LocalRepeat.loopsSong(LocalRepeat.OFF, 1))+ assertFalse(LocalRepeat.loopsSong(LocalRepeat.OFF, 50))+ assertEquals(Player.REPEAT_MODE_OFF, LocalRepeat.playerMode(LocalRepeat.OFF, 50))+ }++ @Test fun aSongStartingLateIsSeen() {+ assertFalse(LocalRepeat.startedLate(0))+ assertFalse(LocalRepeat.startedLate(LocalRepeat.START_SLACK_MS))+ // The loops of the report: 193311, 192908 ms instead of 0.+ assertTrue(LocalRepeat.startedLate(193_311))+ }+}