From 09f32dd893f9e62e58ffdc28050663ae3cdbf5e6 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Fri, 6 Sep 2024 14:07:02 +0200
Subject: [PATCH] make chapters selectable

---
 .../src/main/java/net/newpipe/newplayer/NewPlayer.kt   | 10 +++++++++-
 .../newpipe/newplayer/model/VideoPlayerViewModel.kt    |  2 +-
 .../newplayer/model/VideoPlayerViewModelImpl.kt        |  4 ++--
 .../newplayer/model/ViewoPlayerViewModelDummy.kt       |  4 ++--
 .../newpipe/newplayer/ui/videoplayer/StreamSelectUI.kt |  2 +-
 5 files changed, 15 insertions(+), 7 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 75b583e..7302a39 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/NewPlayer.kt
@@ -95,6 +95,7 @@ interface NewPlayer {
     fun movePlaylistItem(fromIndex: Int, toIndex: Int)
     fun removePlaylistItem(index: Int)
     fun playStream(item: String, playMode: PlayMode)
+    fun selectChapter(index: Int)
     fun playStream(item: String, streamVariant: String, playMode: PlayMode)
 
     data class Builder(val app: Application, val repository: MediaRepository) {
@@ -208,7 +209,6 @@ class NewPlayerImpl(
     override val currentChapters: StateFlow<List<Chapter>> = mutableCurrentChapter.asStateFlow()
 
     init {
-        println("gurken init")
         internalPlayer.addListener(object : Player.Listener {
             override fun onPlayerError(error: PlaybackException) {
                 launchJobAndCollectError {
@@ -339,6 +339,14 @@ 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}")
+        }
+        val chapter = chapters[index]
+        currentPosition = chapter.chapterStartInMs
+    }
 
     private fun internalPlayStream(mediaItem: MediaItem, playMode: PlayMode) {
         if (internalPlayer.playbackState == Player.STATE_IDLE) {
diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt
index dea75bc..fecb119 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/model/VideoPlayerViewModel.kt
@@ -56,7 +56,7 @@ interface VideoPlayerViewModel {
     fun volumeChange(changeRate: Float)
     fun openStreamSelection(selectChapter: Boolean, embeddedUiConfig: EmbeddedUiConfig)
     fun closeStreamSelection()
-    fun chapterSelected(chapter: Chapter)
+    fun chapterSelected(chapterId: Int)
     fun streamSelected(streamId: Int)
     fun cycleRepeatMode()
     fun toggleShuffle()
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 a4ca9f2..8a73768 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
@@ -463,8 +463,8 @@ class VideoPlayerViewModelImpl @Inject constructor(
         updateUiMode(UIModeState.FULLSCREEN_VIDEO)
     }
 
-    override fun chapterSelected(chapter: Chapter) {
-        println("gurken chapter selectd: $chapter")
+    override fun chapterSelected(chapterId: Int) {
+        newPlayer?.selectChapter(chapterId)
     }
 
     override fun streamSelected(streamId: Int) {
diff --git a/new-player/src/main/java/net/newpipe/newplayer/model/ViewoPlayerViewModelDummy.kt b/new-player/src/main/java/net/newpipe/newplayer/model/ViewoPlayerViewModelDummy.kt
index fe4cb61..1dc377b 100644
--- a/new-player/src/main/java/net/newpipe/newplayer/model/ViewoPlayerViewModelDummy.kt
+++ b/new-player/src/main/java/net/newpipe/newplayer/model/ViewoPlayerViewModelDummy.kt
@@ -84,8 +84,8 @@ open class VideoPlayerViewModelDummy : VideoPlayerViewModel {
         println("dummy impl")
     }
 
-    override fun chapterSelected(chapter: Chapter) {
-        println("dummp impl chapter selected: $chapter")
+    override fun chapterSelected(chapterId: Int) {
+        println("dummp impl chapter selected: $chapterId")
     }
 
     override fun streamSelected(streamId: Int) {
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 cf2dbe1..774e86c 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
@@ -100,7 +100,7 @@ fun StreamSelectUI(
                                 chapterStartInMs = chapter.chapterStartInMs,
                                 thumbnail = chapter.thumbnail,
                                 onClicked = {
-                                    viewModel.chapterSelected(chapter)
+                                    viewModel.chapterSelected(chapterIndex)
                                 },
                                 isCurrentChapter = isActiveChapter(
                                     chapterIndex,