wbrawner/Simple-Music-Player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Search item properly using media id

Browse source
This commit is contained in:
Naveen 2023-08-06 23:09:31 +05:30
parent 75557f3b48
commit 22190e4c79
No known key found for this signature in database
GPG key ID: 0E155DAD31671DA3
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/playback/MediaSessionCallback.kt
View file

@ -145,20 +145,24 @@ internal fun PlaybackService.getMediaSessionCallback() = object : MediaLibrarySe
startIndex: Int,
startPositionMs: Long
) = callWhenSourceReady {
var allItems = mediaItems
var realStartIndex = startIndex
var queueItems = mediaItems
var startItemIndex = startIndex
// this is to avoid single items in the queue: https://github.com/androidx/media/issues/156
if (startIndex == C.INDEX_UNSET && mediaItems.size == 1) {
val currentItem = mediaItems[0]
val queueItems = mediaItemProvider.getChildren(currentRoot)?.toMutableList()
val startItemId = mediaItems[0].mediaId
val currentItems = mediaItemProvider.getChildren(currentRoot).orEmpty()
allItems = queueItems?.takeIf { it.contains(currentItem) }
?: mediaItemProvider.getDefaultQueue()?.toMutableList() ?: allItems
realStartIndex = allItems.indexOfFirst { it.mediaId == currentItem.mediaId }
queueItems = if (currentItems.any { it.mediaId == startItemId }) {
currentItems.toMutableList()
} else {
mediaItemProvider.getDefaultQueue()?.toMutableList() ?: queueItems
}
startItemIndex = queueItems.indexOfFirst { it.mediaId == startItemId }
}
super.onSetMediaItems(mediaSession, controller, allItems, realStartIndex, startPositionMs).get()
super.onSetMediaItems(mediaSession, controller, queueItems, startItemIndex, startPositionMs).get()
}
override fun onAddMediaItems(