kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 22:30:30 +05:30
Code Issues Projects Releases Wiki Activity

Fix watching unprocessed livestreams

Browse Source
This commit is contained in:
Bnyro 2023-01-29 14:55:17 +01:00
parent 987782bac2
commit aee24d11d5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -144,7 +144,6 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
/** /**
* Video information fetched at runtime * Video information fetched at runtime
*/ */
private var isLive = false
private lateinit var streams: Streams private lateinit var streams: Streams
/** /**
@ -525,7 +524,9 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
} }
private fun toggleDescription() { private fun toggleDescription() {
var viewInfo = if (!isLive) TextUtils.SEPARATOR + localizedDate(streams.uploadDate) else "" var viewInfo = if (!streams.livestream) TextUtils.SEPARATOR + localizedDate(
streams.uploadDate
) else ""
if (binding.descLinLayout.isVisible) { if (binding.descLinLayout.isVisible) {
// hide the description and chapters // hide the description and chapters
binding.playerDescriptionArrow.animate().rotation(0F).setDuration(250).start() binding.playerDescriptionArrow.animate().rotation(0F).setDuration(250).start()
@ -708,7 +709,8 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
prepareExoPlayerView() prepareExoPlayerView()
initializePlayerView() initializePlayerView()
setupSeekbarPreview() setupSeekbarPreview()
if (!isLive) seekToWatchPosition()
if (!streams.livestream) seekToWatchPosition()
exoPlayer.prepare() exoPlayer.prepare()
if (!DataSaverMode.isEnabled(requireContext())) exoPlayer.play() if (!DataSaverMode.isEnabled(requireContext())) exoPlayer.play()
@ -855,7 +857,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
binding.apply { binding.apply {
playerViewsInfo.text = playerViewsInfo.text =
context?.getString(R.string.views, streams.views.formatShort()) + context?.getString(R.string.views, streams.views.formatShort()) +
if (!isLive) TextUtils.SEPARATOR + localizedDate(streams.uploadDate) else "" if (!streams.livestream) TextUtils.SEPARATOR + localizedDate(streams.uploadDate) else ""
textLike.text = streams.likes.formatShort() textLike.text = streams.likes.formatShort()
textDislike.text = streams.dislikes.formatShort() textDislike.text = streams.dislikes.formatShort()
@ -874,10 +876,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
} }
// duration that's not greater than 0 indicates that the video is live // duration that's not greater than 0 indicates that the video is live
if (streams.duration <= 0) { if (streams.livestream) handleLiveVideo()
isLive = true
handleLiveVideo()
}
playerBinding.exoTitle.text = streams.title playerBinding.exoTitle.text = streams.title
@ -925,7 +924,6 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
if (exoPlayer.currentPosition != 0L) saveWatchPosition() if (exoPlayer.currentPosition != 0L) saveWatchPosition()
// check if video has ended, next video is available and autoplay is enabled. // check if video has ended, next video is available and autoplay is enabled.
@Suppress("DEPRECATION")
if ( if (
playbackState == Player.STATE_ENDED && playbackState == Player.STATE_ENDED &&
!transitioning && !transitioning &&
@ -1073,7 +1071,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
*/ */
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
private fun updateDisplayedDuration() { private fun updateDisplayedDuration() {
if (exoPlayer.duration < 0 || isLive) return if (exoPlayer.duration < 0 || streams.livestream) return
playerBinding.duration.text = DateUtils.formatElapsedTime( playerBinding.duration.text = DateUtils.formatElapsedTime(
exoPlayer.duration.div(1000) exoPlayer.duration.div(1000)
@ -1275,9 +1273,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
if (!PreferenceHelper.getBoolean(PreferenceKeys.USE_HLS_OVER_DASH, false) && if (!PreferenceHelper.getBoolean(PreferenceKeys.USE_HLS_OVER_DASH, false) &&
streams.videoStreams.isNotEmpty() streams.videoStreams.isNotEmpty()
) { ) {
val uri = let { val uri = streams.dash?.toUri() ?: let {
streams.dash?.toUri()
val manifest = DashHelper.createManifest(streams) val manifest = DashHelper.createManifest(streams)
// encode to base64 // encode to base64