From 106060625ced26f3f0a7bf0da8f9cc3a69172bf7 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Fri, 6 Sep 2024 14:30:18 +0200
Subject: [PATCH] make playlist item selectable

---
 .../src/main/java/net/newpipe/newplayer/NewPlayer.kt   | 10 +++++++++-
 .../newplayer/model/VideoPlayerViewModelImpl.kt        |  3 ++-
 .../newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt b/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt
index 7302a39..379425c 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt
@@ -96,6 +96,7 @@ interface NewPlayer {
     fun removePlaylistItem(index: Int)
     fun playStream(item: String, playMode: PlayMode)
     fun selectChapter(index: Int)
+    fun selectPlaylistItem(index: Int)
     fun playStream(item: String, streamVariant: String, playMode: PlayMode)
 
     data class Builder(val app: Application, val repository: MediaRepository) {
@@ -342,12 +343,19 @@ class NewPlayerImpl(
     override fun selectChapter(index: Int) {
         val chapters = currentChapters.value
         assert(index in 0..<chapters.size) {
-            throw NewPlayerException("Chapter selection out of bound: seleced chapter index: $index, available chapters: ${chapters.size}")
+            throw NewPlayerException("Chapter selection out of bound: selected chapter index: $index, available chapters: ${chapters.size}")
         }
         val chapter = chapters[index]
         currentPosition = chapter.chapterStartInMs
     }
 
+    override fun selectPlaylistItem(index: Int) {
+        assert(index in 0..<playlist.value.size) {
+            throw NewPlayerException("Playlist item selection out of bound: selected item index: $index, available chapters: ${playlist.value.size}")
+        }
+        internalPlayer.seekTo(index, 0)
+    }
+
     private fun internalPlayStream(mediaItem: MediaItem, playMode: PlayMode) {
         if (internalPlayer.playbackState == Player.STATE_IDLE) {
             internalPlayer.prepare()
diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt
index 8a73768..647bac9 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModelImpl.kt
@@ -468,7 +468,8 @@ class VideoPlayerViewModelImpl @Inject constructor(
     }
 
     override fun streamSelected(streamId: Int) {
-        println("stream selected: $streamId")
+        println("gurken stream selected: $streamId")
+        newPlayer?.selectPlaylistItem(streamId)
     }
 
     override fun cycleRepeatMode() {
diff --git a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt
index 774e86c..9945624 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt
@@ -152,7 +152,7 @@ fun ReorderableStreamItemsList(
             ) { isDragging ->
                 StreamItem(
                     playlistItem = playlistItem,
-                    onClicked = { viewModel.streamSelected(0) },
+                    onClicked = { viewModel.streamSelected(index) },
                     reorderableScope = this@ReorderableItem,
                     haptic = haptic,
                     onDragFinished = viewModel::onStreamItemDragFinished,