Skip to content
Snippets Groups Projects
Commit 0f9fb811 authored by Robert Stone's avatar Robert Stone Committed by Nicolas Pomepuy
Browse files

Replace array copies with a sublist

(cherry picked from commit 13fe216b)
parent 09932869
No related branches found
No related tags found
1 merge request!7943.3.x
...@@ -16,7 +16,6 @@ import org.videolan.resources.MEDIALIBRARY_PAGE_SIZE ...@@ -16,7 +16,6 @@ import org.videolan.resources.MEDIALIBRARY_PAGE_SIZE
import org.videolan.resources.util.getFromMl import org.videolan.resources.util.getFromMl
import org.videolan.vlc.extensions.ExtensionsManager import org.videolan.vlc.extensions.ExtensionsManager
import org.videolan.vlc.media.MediaSessionBrowser import org.videolan.vlc.media.MediaSessionBrowser
import org.videolan.vlc.media.MediaSessionBrowser.Companion.MAX_HISTORY_SIZE
import org.videolan.vlc.util.VoiceSearchParams import org.videolan.vlc.util.VoiceSearchParams
import org.videolan.vlc.util.awaitMedialibraryStarted import org.videolan.vlc.util.awaitMedialibraryStarted
import java.util.* import java.util.*
...@@ -74,16 +73,16 @@ internal class MediaSessionCallback(private val playbackService: PlaybackService ...@@ -74,16 +73,16 @@ internal class MediaSessionCallback(private val playbackService: PlaybackService
} }
} }
mediaId == MediaSessionBrowser.ID_LAST_ADDED -> { mediaId == MediaSessionBrowser.ID_LAST_ADDED -> {
val tracks = context.getFromMl { recentAudio } val tracks = context.getFromMl { recentAudio?.toList() }
if (tracks.isNotEmpty() && isActive) { if (!tracks.isNullOrEmpty() && isActive) {
val mediaList = tracks.copyOfRange(0, tracks.size.coerceAtMost(MediaSessionBrowser.MAX_HISTORY_SIZE)) val mediaList = tracks.subList(0, tracks.size.coerceAtMost(MediaSessionBrowser.MAX_HISTORY_SIZE))
playbackService.load(mediaList, 0) playbackService.load(mediaList, 0)
} }
} }
mediaId == MediaSessionBrowser.ID_HISTORY -> { mediaId == MediaSessionBrowser.ID_HISTORY -> {
val tracks = context.getFromMl { lastMediaPlayed() } val tracks = context.getFromMl { lastMediaPlayed()?.toList() }
if (tracks.isNotEmpty() && isActive) { if (!tracks.isNullOrEmpty() && isActive) {
val mediaList = tracks.copyOfRange(0, tracks.size.coerceAtMost(MediaSessionBrowser.MAX_HISTORY_SIZE)) val mediaList = tracks.subList(0, tracks.size.coerceAtMost(MediaSessionBrowser.MAX_HISTORY_SIZE))
playbackService.load(mediaList, 0) playbackService.load(mediaList, 0)
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment