mirror of
https://github.com/libre-tube/LibreTube.git
synced 2025-04-29 16:30:31 +05:30
Implement autoplay
This commit is contained in:
parent
b25b65d3c8
commit
c41a554b95
@ -53,6 +53,7 @@ import com.github.libretube.obj.Segment
|
|||||||
import com.github.libretube.obj.Segments
|
import com.github.libretube.obj.Segments
|
||||||
import com.github.libretube.obj.Streams
|
import com.github.libretube.obj.Streams
|
||||||
import com.github.libretube.obj.Subscribe
|
import com.github.libretube.obj.Subscribe
|
||||||
|
import com.github.libretube.obj.StreamItem
|
||||||
import com.github.libretube.preferences.SponsorBlockSettings
|
import com.github.libretube.preferences.SponsorBlockSettings
|
||||||
import com.github.libretube.util.CronetHelper
|
import com.github.libretube.util.CronetHelper
|
||||||
import com.github.libretube.util.DescriptionAdapter
|
import com.github.libretube.util.DescriptionAdapter
|
||||||
@ -101,6 +102,8 @@ class PlayerFragment : Fragment() {
|
|||||||
private var eId: Int = 0
|
private var eId: Int = 0
|
||||||
private var paused = false
|
private var paused = false
|
||||||
private var whichQuality = 0
|
private var whichQuality = 0
|
||||||
|
private var transitioning = false
|
||||||
|
private var autoplay = false;
|
||||||
private var isZoomed: Boolean = false
|
private var isZoomed: Boolean = false
|
||||||
|
|
||||||
private var isSubscribed: Boolean = false
|
private var isSubscribed: Boolean = false
|
||||||
@ -115,6 +118,7 @@ class PlayerFragment : Fragment() {
|
|||||||
private lateinit var motionLayout: MotionLayout
|
private lateinit var motionLayout: MotionLayout
|
||||||
private lateinit var exoPlayer: ExoPlayer
|
private lateinit var exoPlayer: ExoPlayer
|
||||||
private lateinit var segmentData: Segments
|
private lateinit var segmentData: Segments
|
||||||
|
private var relatedStreams: List<StreamItem>? = arrayListOf()
|
||||||
private var relatedStreamsEnabled = true
|
private var relatedStreamsEnabled = true
|
||||||
|
|
||||||
private lateinit var relDownloadVideo: LinearLayout
|
private lateinit var relDownloadVideo: LinearLayout
|
||||||
@ -386,10 +390,13 @@ class PlayerFragment : Fragment() {
|
|||||||
uploader = response.uploader!!
|
uploader = response.uploader!!
|
||||||
thumbnailUrl = response.thumbnailUrl!!
|
thumbnailUrl = response.thumbnailUrl!!
|
||||||
|
|
||||||
// check whether related streams are enabled
|
// check whether related streams and autoplay are enabled
|
||||||
val sharedPreferences = PreferenceManager
|
val sharedPreferences = PreferenceManager
|
||||||
.getDefaultSharedPreferences(requireContext())
|
.getDefaultSharedPreferences(requireContext())
|
||||||
|
autoplay = sharedPreferences.getBoolean("autoplay", false)
|
||||||
relatedStreamsEnabled = sharedPreferences.getBoolean("related_streams_toggle", true)
|
relatedStreamsEnabled = sharedPreferences.getBoolean("related_streams_toggle", true)
|
||||||
|
// save related streams for autoplay
|
||||||
|
relatedStreams = response.relatedStreams
|
||||||
runOnUiThread {
|
runOnUiThread {
|
||||||
createExoPlayer(view)
|
createExoPlayer(view)
|
||||||
prepareExoPlayerView()
|
prepareExoPlayerView()
|
||||||
@ -515,8 +522,18 @@ class PlayerFragment : Fragment() {
|
|||||||
!playWhenReady
|
!playWhenReady
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
// check if video has ended, next video is available and autoplay is enabled.
|
||||||
|
if(playbackState == Player.STATE_ENDED && relatedStreams != null && relatedStreams!!.isNotEmpty() && !transitioning && autoplay)
|
||||||
|
{
|
||||||
|
transitioning = true
|
||||||
|
videoId = relatedStreams!![0].url!!.replace("/watch?v=","")
|
||||||
|
fetchJsonAndInitPlayer(view)
|
||||||
|
}
|
||||||
|
|
||||||
if (playWhenReady && playbackState == Player.STATE_READY) {
|
if (playWhenReady && playbackState == Player.STATE_READY) {
|
||||||
// media actually playing
|
// media actually playing
|
||||||
|
transitioning = false
|
||||||
view.findViewById<ImageView>(R.id.play_imageView)
|
view.findViewById<ImageView>(R.id.play_imageView)
|
||||||
.setImageResource(R.drawable.ic_pause)
|
.setImageResource(R.drawable.ic_pause)
|
||||||
} else if (playWhenReady) {
|
} else if (playWhenReady) {
|
||||||
|
@ -184,4 +184,5 @@
|
|||||||
<string name="buffering_goal">Preloading</string>
|
<string name="buffering_goal">Preloading</string>
|
||||||
<string name="buffering_goal_summary">Max. amount of seconds of video to buffer.</string>
|
<string name="buffering_goal_summary">Max. amount of seconds of video to buffer.</string>
|
||||||
<string name="playerVideoFormat">Video format for player</string>
|
<string name="playerVideoFormat">Video format for player</string>
|
||||||
|
<string name="player_autoplay">Autoplay</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
@ -40,6 +40,13 @@
|
|||||||
app:summary="@string/buffering_goal_summary"
|
app:summary="@string/buffering_goal_summary"
|
||||||
app:title="@string/buffering_goal" />
|
app:title="@string/buffering_goal" />
|
||||||
|
|
||||||
|
<SwitchPreferenceCompat
|
||||||
|
android:icon="@drawable/ic_play"
|
||||||
|
app:key="autoplay"
|
||||||
|
app:title="@string/player_autoplay"
|
||||||
|
android:summaryOff="@string/disabled"
|
||||||
|
android:summaryOn="@string/enabled" />
|
||||||
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
<PreferenceCategory app:title="@string/downloads">
|
<PreferenceCategory app:title="@string/downloads">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user