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

Merge pull request #4827 from FineFindus/fix/pause-min

Browse Source 
fix: allow pausing when buffer is less than min buffer
This commit is contained in:
Bnyro 2023-09-21 12:45:09 +02:00 committed by GitHub
commit 20d1bca3a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/github/libretube/extensions/Player.kt
View File

@ -1,6 +1,7 @@
package com.github.libretube.extensions package com.github.libretube.extensions
import androidx.media3.common.Player import androidx.media3.common.Player
import com.github.libretube.helpers.PlayerHelper
fun Player.togglePlayPauseState() { fun Player.togglePlayPauseState() {
when { when {
@ -13,7 +14,7 @@ fun Player.togglePlayPauseState() {
seekTo(0) seekTo(0)
} }
!isPlaying && totalBufferedDuration > 0 -> play() !isPlaying && totalBufferedDuration > PlayerHelper.MINIMUM_BUFFER_DURATION -> play()
else -> pause() else -> pause()
} }
} }

3
app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
View File

@ -46,6 +46,7 @@ object PlayerHelper {
const val CONTROL_TYPE = "control_type" const val CONTROL_TYPE = "control_type"
const val SPONSOR_HIGHLIGHT_CATEGORY = "poi_highlight" const val SPONSOR_HIGHLIGHT_CATEGORY = "poi_highlight"
const val ROLE_FLAG_AUTO_GEN_SUBTITLE = C.ROLE_FLAG_SUPPLEMENTARY const val ROLE_FLAG_AUTO_GEN_SUBTITLE = C.ROLE_FLAG_SUPPLEMENTARY
const val MINIMUM_BUFFER_DURATION = 1000 * 10 // exo default is 50s
/** /**
* A list of all categories that are not disabled by default * A list of all categories that are not disabled by default
@ -437,7 +438,7 @@ object PlayerHelper {
// cache the last three minutes // cache the last three minutes
.setBackBuffer(1000 * 60 * 3, true) .setBackBuffer(1000 * 60 * 3, true)
.setBufferDurationsMs( .setBufferDurationsMs(
1000 * 10, // exo default is 50s MINIMUM_BUFFER_DURATION,
bufferingGoal, bufferingGoal,
DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS, DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS,
DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS

2
app/src/main/java/com/github/libretube/ui/adapters/SearchAdapter.kt
View File

@ -31,7 +31,7 @@ import kotlinx.serialization.encodeToString
class SearchAdapter( class SearchAdapter(
private val isChannelAdapter: Boolean = false, private val isChannelAdapter: Boolean = false,
private val timeStamp: Long = 0, private val timeStamp: Long = 0
) : ListAdapter<ContentItem, SearchViewHolder>(SearchCallback) { ) : ListAdapter<ContentItem, SearchViewHolder>(SearchCallback) {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SearchViewHolder {
val layoutInflater = LayoutInflater.from(parent.context) val layoutInflater = LayoutInflater.from(parent.context)

3
app/src/main/java/com/github/libretube/ui/fragments/SearchResultFragment.kt
View File

@ -21,7 +21,6 @@ import com.github.libretube.db.DatabaseHelper
import com.github.libretube.db.obj.SearchHistoryItem import com.github.libretube.db.obj.SearchHistoryItem
import com.github.libretube.extensions.TAG import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.hideKeyboard import com.github.libretube.extensions.hideKeyboard
import com.github.libretube.extensions.toID
import com.github.libretube.extensions.toastFromMainDispatcher import com.github.libretube.extensions.toastFromMainDispatcher
import com.github.libretube.helpers.PreferenceHelper import com.github.libretube.helpers.PreferenceHelper
import com.github.libretube.ui.adapters.SearchAdapter import com.github.libretube.ui.adapters.SearchAdapter
@ -106,7 +105,7 @@ class SearchResultFragment : Fragment() {
val searchQuery = query.toHttpUrlOrNull()?.let { val searchQuery = query.toHttpUrlOrNull()?.let {
val videoId = TextUtils.getVideoIdFromUrl(it.toString()) ?: query val videoId = TextUtils.getVideoIdFromUrl(it.toString()) ?: query
timeStamp = it.queryParameter("t")?.toTimeInSeconds() timeStamp = it.queryParameter("t")?.toTimeInSeconds()
"${ShareDialog.YOUTUBE_FRONTEND_URL}/watch?v=${videoId}" "${ShareDialog.YOUTUBE_FRONTEND_URL}/watch?v=$videoId"
} ?: query } ?: query
repeatOnLifecycle(Lifecycle.State.CREATED) { repeatOnLifecycle(Lifecycle.State.CREATED) {