Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(player): Keep the player paused when loading tracks after changin… #1878

Merged
merged 2 commits into from
Jan 18, 2025
+25 −1
Merged

fix(player): Keep the player paused when loading tracks after changin… #1878

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b4b30a
fix(player): Keep the player paused when loading tracks after changin…
Secozzi Jan 18, 2025
37c25ab
spotless(spotless): spotless
Secozzi Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ class PlayerViewModel @JvmOverloads constructor(
private val _paused = MutableStateFlow(false)
val paused = _paused.asStateFlow()

// False because the video shouldn't start paused
private val _pausedState = MutableStateFlow<Boolean?>(false)
val pausedState = _pausedState.asStateFlow()

private val _controlsShown = MutableStateFlow(!playerPreferences.hideControls().get())
val controlsShown = _controlsShown.asStateFlow()
private val _seekBarShown = MutableStateFlow(!playerPreferences.hideControls().get())
Expand Down Expand Up @@ -400,7 +404,7 @@ class PlayerViewModel @JvmOverloads constructor(

isLoadingTracks.update { _ -> true }
updateIsLoadingEpisode(false)
unpause()
setPausedState()
}

@Immutable
Expand Down Expand Up @@ -454,6 +458,10 @@ class PlayerViewModel @JvmOverloads constructor(

val idx = videoList.value.indexOf(video)

updatePausedState()
// Pause until everything has loaded
pause()

activity.setVideoList(
qualityIndex = idx,
videos = videoList.value,
Expand Down Expand Up @@ -526,6 +534,22 @@ class PlayerViewModel @JvmOverloads constructor(
_readAhead.update { value.toFloat() }
}

private fun updatePausedState() {
_pausedState.update { _ -> paused.value }
}

private fun setPausedState() {
pausedState.value?.let {
if (it) {
pause()
} else {
unpause()
}

_pausedState.update { _ -> null }
}
}

fun pauseUnpause() {
if (paused.value) {
unpause()
Expand Down
Loading