make seeking update the player emediatly

new-player/src/main/java/net/newpipe/newplayer/model/NewPlayerViewModelImpl.kt

@@ -51,6 +51,7 @@ import net.newpipe.newplayer.PlayMode
 import net.newpipe.newplayer.RepeatMode
 import net.newpipe.newplayer.ui.ContentScale
 import java.util.LinkedList
+import kotlin.math.abs
 
 val VIDEOPLAYER_UI_STATE = "video_player_ui_state"
 
@@ -78,6 +79,8 @@ class NewPlayerViewModelImpl @Inject constructor(
     // this is necesary to restore the embedded view UI configuration when returning from fullscreen
     private var embeddedUiConfig: EmbeddedUiConfig? = null
 
+    private var playbackPositionWhenFastSeekStarted = 0L
+
     private val audioManager =
         getSystemService(application.applicationContext, AudioManager::class.java)!!
 
@@ -352,17 +355,14 @@ class NewPlayerViewModelImpl @Inject constructor(
         }
 
         if (newUiModeState.isStreamSelect) {
-            resetPlaylistProgressUpdaterJob()
+            startPlaylistProgressUpdaterJob()
-        }
+        } else {
-
-        if (newUiModeState.isChapterSelect) {
-            resetPlaylistProgressUpdaterJob()
-        }
-
-        if ((uiState.value.uiMode.isStreamSelect || uiState.value.uiMode.isChapterSelect)
-            && (!newUiModeState.isStreamSelect && !newUiModeState.isChapterSelect)
-        ) {
             playlistProgressUpdaterJob?.cancel()
+        }
+
+        if (newUiModeState.requiresProgressUpdate) {
+            startProgressUpdatePeriodicallyJob()
+        } else {
             progressUpdaterJob?.cancel()
         }
 
@@ -423,7 +423,7 @@ class NewPlayerViewModelImpl @Inject constructor(
         }
     }
 
-    private fun resetPlaylistProgressUpdaterJob() {
+    private fun startPlaylistProgressUpdaterJob() {
         playlistProgressUpdaterJob?.cancel()
         playlistProgressUpdaterJob = viewModelScope.launch {
             while (true) {
@@ -452,15 +452,22 @@ class NewPlayerViewModelImpl @Inject constructor(
 
     override fun seekPositionChanged(newValue: Float) {
         hideUiDelayedJob?.cancel()
-        mutableUiState.update { it.copy(seekerPosition = newValue) }
+        progressUpdaterJob?.cancel()
-    }
-
-    override fun seekingFinished() {
-        startHideUiDelayedJob()
         val seekerPosition = mutableUiState.value.seekerPosition
         val seekPositionInMs = (newPlayer?.duration?.toFloat() ?: 0F) * seekerPosition
         newPlayer?.currentPosition = seekPositionInMs.toLong()
         Log.i(TAG, "Seek to Ms: $seekPositionInMs")
+        mutableUiState.update {
+            it.copy(
+                seekerPosition = newValue,
+                playbackPositionInMs = seekPositionInMs.toLong()
+            )
+        }
+    }
+
+    override fun seekingFinished() {
+        startHideUiDelayedJob()
+        startProgressUpdatePeriodicallyJob()
     }
 
     override fun embeddedDraggedDown(offset: Float) {
@@ -468,12 +475,26 @@ class NewPlayerViewModelImpl @Inject constructor(
     }
 
     override fun fastSeek(count: Int) {
+        if(abs(count) == 1) {
+            playbackPositionWhenFastSeekStarted = newPlayer?.currentPosition ?: 0
+        }
+
+        val fastSeekAmountInS = count * (newPlayer?.fastSeekAmountSec ?: 10)
         mutableUiState.update {
             it.copy(
-                fastSeekSeconds = count * (newPlayer?.fastSeekAmountSec ?: 10)
+                fastSeekSeconds = fastSeekAmountInS
             )
         }
 
+
+        if (fastSeekAmountInS != 0) {
+            Log.d(TAG, "fast seeking seeking by $fastSeekAmountInS seconds")
+
+            newPlayer?.currentPosition =
+                playbackPositionWhenFastSeekStarted + (fastSeekAmountInS * 1000)
+
+        }
+
         if (mutableUiState.value.uiMode.videoControllerUiVisible) {
             startHideUiDelayedJob()
         }
@@ -483,18 +504,10 @@ class NewPlayerViewModelImpl @Inject constructor(
         if (mutableUiState.value.uiMode.videoControllerUiVisible) {
             startHideUiDelayedJob()
         }
-
-        val fastSeekAmount = mutableUiState.value.fastSeekSeconds
-        if (fastSeekAmount != 0) {
-            Log.d(TAG, "$fastSeekAmount")
-
-            newPlayer?.currentPosition =
-                (newPlayer?.currentPosition ?: 0) + (fastSeekAmount * 1000)
         mutableUiState.update {
             it.copy(fastSeekSeconds = 0)
         }
     }
-    }
 
     override fun brightnessChange(changeRate: Float, systemBrightness: Float) {
         if (mutableUiState.value.uiMode.fullscreen) {
@@ -578,7 +591,7 @@ class NewPlayerViewModelImpl @Inject constructor(
                 playList = tempList
             )
         }
-        resetPlaylistProgressUpdaterJob()
+        startPlaylistProgressUpdaterJob()
     }
 
     override fun onStreamItemDragFinished() {

new-player/src/main/java/net/newpipe/newplayer/model/UIModeState.kt

@@ -98,6 +98,24 @@ enum class UIModeState {
                 else -> false
             }
 
+    val requiresProgressUpdate: Boolean
+        get() =
+            when(this) {
+                PLACEHOLDER -> false
+                EMBEDDED_VIDEO -> false
+                EMBEDDED_VIDEO_CONTROLLER_UI -> true
+                EMBEDDED_VIDEO_CHAPTER_SELECT -> false
+                EMBEDDED_VIDEO_STREAM_SELECT -> false
+                FULLSCREEN_VIDEO -> false
+                FULLSCREEN_VIDEO_CONTROLLER_UI -> true
+                FULLSCREEN_VIDEO_CHAPTER_SELECT -> false
+                FULLSCREEN_VIDEO_STREAM_SELECT -> false
+                EMBEDDED_AUDIO -> true
+                FULLSCREEN_AUDIO -> true
+                AUDIO_CHAPTER_SELECT -> false
+                AUDIO_STREAM_SELECT -> false
+            }
+
     // STATE TRANSITIONS
 
     fun getControllerUiVisibleState() =