Twelve: Take into account the timeline for the queue (50532460) · Commits · e / os / android_packages_apps_Twelve

app/src/main/java/org/lineageos/twelve/ext/Player.kt

+26 −7

Original line number	Diff line number	Diff line
		@@ -157,15 +157,30 @@ fun Player.tracksFlow() = conflatedCallbackFlow {
		}
		}

		fun Player.mediaItemsShuffled() = currentTimeline.getFirstWindowIndex(shuffleModeEnabled).takeIf {
		it != C.INDEX_UNSET
		}?.let { startIndex ->
		var index = startIndex
		buildList {
		repeat(currentTimeline.windowCount) {
		add(getMediaItemAt(index))
		index = currentTimeline.getNextWindowIndex(
		index, Player.REPEAT_MODE_OFF, shuffleModeEnabled
		)
		}
		}.let { items ->
		items.indexOfFirst { getMediaItemAt(currentMediaItemIndex) == it } to items
		}
		} ?: (currentMediaItemIndex to mediaItems)

		fun Player.queueFlow() = conflatedCallbackFlow {
		val emitQueue = {
		val currentMediaItemIndex = currentMediaItemIndex

		trySend(
		mediaItems.mapIndexed { index, mediaItem ->
		QueueItem(mediaItem, index == currentMediaItemIndex)
		}
		val (currentIndex, mediaItems) = mediaItemsShuffled()
		trySend(mediaItems.mapIndexed { index, mediaItem ->
		QueueItem(
		mediaItem = mediaItem, isCurrent = index == currentIndex
		)
		})
		}

		val listener = object : Player.Listener {
		@@ -176,6 +191,10 @@ fun Player.queueFlow() = conflatedCallbackFlow {
		override fun onMediaItemTransition(mediaItem: MediaItem?, reason: Int) {
		emitQueue()
		}

		override fun onShuffleModeEnabledChanged(shuffleModeEnabled: Boolean) {
		emitQueue()
		}
		}

		addListener(listener)