#496 - start and seek in on prepared listener,

Author: sentinelweb

app/src/main/java/uk/co/sentinelweb/cuer/app/ui/player/android/AndroidVideoComposeables.kt

@@ -49,11 +49,17 @@ object AndroidVideoComposeables : KoinComponent {
         var aspectRatioState by remember { mutableStateOf(1f) }
         var controlsVisible by remember { mutableStateOf(true) }
         var volumeVisible by remember { mutableStateOf(true) }
+        var loadCommand by remember { mutableStateOf<PlayerCommand.Load?>(null) }
 
         val mediaPlayer = remember {
             MediaPlayer().apply {
                 setOnPreparedListener {
                     start()
+                    loadCommand
+                        ?.startPosition
+                        ?.takeIf { it > 0 }
+                        ?.also { seekTo(it.toInt()) }
+                        ?.also { loadCommand = null }
                     view.dispatch(DurationReceived(duration.toLong()))
                 }
                 setOnVideoSizeChangedListener { _, width, height ->
@@ -89,7 +95,11 @@ object AndroidVideoComposeables : KoinComponent {
 
         LaunchedEffect(label.value) {
             when (label.value) {
-                is Command -> processCommand((label.value as Command).command, mediaPlayer)
+                is Command -> {
+                    processCommand((label.value as Command).command, mediaPlayer)
+                    loadCommand = (label.value as? Command)?.command as? PlayerCommand.Load
+                }
+
                 else -> Unit
             }
         }
@@ -206,9 +216,6 @@ object AndroidVideoComposeables : KoinComponent {
                         mediaPlayer.reset()
                         mediaPlayer.setDataSource(url)
                         mediaPlayer.prepareAsync()
-                        if (command.startPosition > 0) {
-                            mediaPlayer.seekTo(command.startPosition.toInt())
-                        }
                     }
             }
 

app/src/main/java/uk/co/sentinelweb/cuer/app/ui/player/exoplayer/ExoPlayerActivity.kt

@@ -39,9 +39,7 @@ import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 import org.koin.android.scope.AndroidScopeComponent
 import org.koin.core.scope.Scope
-import rewriteIdsToSource
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Identifier
-import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.LOCAL
 import uk.co.sentinelweb.cuer.app.orchestrator.OrchestratorContract.Source.MEMORY
 import uk.co.sentinelweb.cuer.app.orchestrator.PlaylistOrchestrator
 import uk.co.sentinelweb.cuer.app.orchestrator.deepOptions
@@ -63,6 +61,7 @@ import uk.co.sentinelweb.cuer.app.util.extension.activityScopeWithSource
 import uk.co.sentinelweb.cuer.app.util.remote.VideoWakeLockManager
 import uk.co.sentinelweb.cuer.app.util.wrapper.HideStatusBarWrapper
 import uk.co.sentinelweb.cuer.app.util.wrapper.ShowOnLockScreenWrapper
+import uk.co.sentinelweb.cuer.core.wrapper.LogWrapper
 import uk.co.sentinelweb.cuer.domain.PlaylistAndItemDomain
 import uk.co.sentinelweb.cuer.domain.PlaylistDomain
 import uk.co.sentinelweb.cuer.domain.ext.serialise
@@ -79,6 +78,11 @@ class ExoPlayerActivity : FragmentActivity(), AndroidScopeComponent {
     private val floatingService: FloatingPlayerServiceManager by inject()
     private val showOnLockScreen: ShowOnLockScreenWrapper by inject()
     private val videoWakeLockManager: VideoWakeLockManager by inject()
+    private val log: LogWrapper by inject()
+
+    init {
+        log.tag(this)
+    }
 
     private lateinit var mviView: MviViewImpl
 
@@ -133,7 +137,7 @@ class ExoPlayerActivity : FragmentActivity(), AndroidScopeComponent {
 
         override val renderer: ViewRenderer<Model> = object : ViewRenderer<Model> {
             override fun render(model: Model) {
-                Log.d("ExoActivity", "playState=${model.playState}, title=${model.texts.title}")
+                log.d("playState=${model.playState}, title=${model.texts.title}")
                 _model.value = model
             }
         }
@@ -167,6 +171,8 @@ class ExoPlayerActivity : FragmentActivity(), AndroidScopeComponent {
             activityClass: KClass<out Activity> = ExoPlayerActivity::class
         ) =
             CoroutineScope(Dispatchers.Main).launch {
+                Log.d("ExoActivity", "start playlistAndItem.id=${playlistAndItem.item.id}")
+                Log.d("ExoActivity", "start playlistAndItem.media.id=${playlistAndItem.item.media.id}")
                 val use: PlaylistAndItemDomain = if (playlistAndItem.playlistId == null) {
                     //  make temporary queue playlist
                     val queuePlaylist = PlaylistDomain(
@@ -175,14 +181,17 @@ class ExoPlayerActivity : FragmentActivity(), AndroidScopeComponent {
                         type = PlaylistDomain.PlaylistTypeDomain.APP,
                         items = listOf(
                             // todo just leave as local when databse is is saving.
-                            if (playlistAndItem.item.id?.source == LOCAL) {
-                                playlistAndItem.item.rewriteIdsToSource(MEMORY, null)
-                            } else playlistAndItem.item
+//                            if (playlistAndItem.item.id?.source == LOCAL) {
+//                                playlistAndItem.item.rewriteIdsToSource(MEMORY, null)
+//                            } else
+                            playlistAndItem.item
                         )
                     )
                     // save to memory
                     getKoin().get<PlaylistOrchestrator>()
                         .save(queuePlaylist, queuePlaylist.id!!.deepOptions())
+                    Log.d("ExoActivity", "start playlistAndItem.id=${queuePlaylist.items[0].id}")
+                    Log.d("ExoActivity", "start playlistAndItem.media.id=${queuePlaylist.items[0].media.id}")
 
                     playlistAndItem.copy(
                         playlistId = queuePlaylist.id,