kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 08:20:32 +05:30
Code Issues Projects Releases Wiki Activity

Load the video data correctly

Browse Source 
Now you can play in background mode the video you selected.
This commit is contained in:
Relwi 2022-05-07 14:47:00 +02:00
parent bcfa84a08a
commit 970d1246ab
No known key found for this signature in database
GPG Key ID: 3316DC3D260D0163
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/com/github/libretube/VideoOptionsDialog.kt
View File

@ -4,11 +4,12 @@ import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import androidx.fragment.app.DialogFragment import androidx.fragment.app.DialogFragment
import androidx.lifecycle.lifecycleScope
import com.github.libretube.obj.Streams import com.github.libretube.obj.Streams
import com.google.android.exoplayer2.ExoPlayer import com.google.android.exoplayer2.ExoPlayer
import com.google.android.exoplayer2.MediaItem import com.google.android.exoplayer2.MediaItem
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
/** /**
* Dialog with different options for a selected video. * Dialog with different options for a selected video.
@ -24,7 +25,7 @@ class VideoOptionsDialog(private val videoId: String) : DialogFragment() {
/** /**
* The response that gets when called the Api. * The response that gets when called the Api.
*/ */
private lateinit var response: Streams private var response: Streams? = null
/** /**
* The [ExoPlayer] player. Followed tutorial [here](https://developer.android.com/codelabs/exoplayer-intro) * The [ExoPlayer] player. Followed tutorial [here](https://developer.android.com/codelabs/exoplayer-intro)
@ -39,6 +40,9 @@ class VideoOptionsDialog(private val videoId: String) : DialogFragment() {
*/ */
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
return MaterialAlertDialogBuilder(requireContext()) return MaterialAlertDialogBuilder(requireContext())
.setNegativeButton(R.string.cancel) { dialog, _ ->
dialog.dismiss()
}
.setAdapter( .setAdapter(
ArrayAdapter( ArrayAdapter(
requireContext(), requireContext(),
@ -51,15 +55,7 @@ class VideoOptionsDialog(private val videoId: String) : DialogFragment() {
when (which) { when (which) {
// This for example will be the "Background mode" option // This for example will be the "Background mode" option
0 -> { 0 -> {
lifecycleScope.launchWhenCreated { playOnBackgroundMode()
// FIXME: For some reason I can't get the response
response = RetrofitInstance.api.getStreams(videoId)
initializePlayer()
player?.playWhenReady = playWhenReady
player?.seekTo(currentItem, playbackPosition)
player?.prepare()
}
} }
else -> { else -> {
dialog.dismiss() dialog.dismiss()
@ -70,19 +66,21 @@ class VideoOptionsDialog(private val videoId: String) : DialogFragment() {
} }
/** /**
* Initializes the [Exoplayer] player with the [MediaItem]. * Initializes the [player] player with the [MediaItem].
*/ */
private fun initializePlayer() { private fun initializePlayer() {
player = ExoPlayer.Builder(requireContext()) player = ExoPlayer.Builder(requireContext())
.build() .build()
.also { exoPlayer -> .also { exoPlayer ->
val mediaItem = MediaItem.fromUri(response.hls!!) response?.let {
exoPlayer.setMediaItem(mediaItem) val mediaItem = MediaItem.fromUri(response!!.hls!!)
exoPlayer.setMediaItem(mediaItem)
}
} }
} }
/** /**
* Releases the [ExoPlayer]. * Releases the [player].
*/ */
private fun releasePlayer() { private fun releasePlayer() {
player?.let { exoPlayer -> player?.let { exoPlayer ->
@ -94,6 +92,24 @@ class VideoOptionsDialog(private val videoId: String) : DialogFragment() {
player = null player = null
} }
/**
* Gets the video data and prepares the [player].
*/
private fun playOnBackgroundMode() {
runBlocking {
val job = launch {
response = RetrofitInstance.api.getStreams(videoId)
}
// Wait until the job is done, to load correctly later in the player
job.join()
initializePlayer()
player?.playWhenReady = playWhenReady
player?.seekTo(currentItem, playbackPosition)
player?.prepare()
}
}
companion object { companion object {
const val TAG = "VideoOptionsDialog" const val TAG = "VideoOptionsDialog"