Skip to content

Fix live playback queue restart #157

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

Merged
kalzEOS merged 1 commit into from
Jul 4, 2026
Merged

Fix live playback queue restart #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import java.util.Properties
import org.gradle.api.provider.Property
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

val appVersionCode = 151
val appVersionName = "3.5.5"
val appVersionCode = 152
val appVersionName = "3.5.6"

plugins {
alias(libs.plugins.android.application)
Expand Down
15 changes: 15 additions & 0 deletions app/src/main/java/com/example/xtreamplayer/MainActivityUi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,8 +1183,23 @@ fun RootScreen(
BufferProfile.VOD
}
playbackEngine.setBufferProfile(profile)
val prevQueue = activePlaybackQueue
activePlaybackQueue = queue
activePlaybackTitle = queue.items.getOrNull(queue.startIndex)?.title ?: startItem.title
// If the queue is structurally identical to the current one, Compose won't re-fire
// LaunchedEffect(activePlaybackQueue). This happens when switching back to the original
// channel after ExoPlayer has silently auto-advanced to a different queue position.
if (queue == prevQueue) {
playbackFallbackAttempts = queue.fallbackUris.mapValues { 0 }
playbackPrimaryRetries = queue.fallbackUris.mapValues { 0 }
playbackEngine.setQueue(queue.items, queue.startIndex)
val seekPosition = resumePositionMs
if (seekPosition != null && seekPosition > 0) {
playbackEngine.player.seekTo(seekPosition)
resumePositionMs = null
}
playbackEngine.player.playWhenReady = true
}
}

val handlePlayItem: (ContentItem, List<ContentItem>) -> Unit = { item, items ->
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/example/xtreamplayer/MainActivityUiPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2071,8 +2071,8 @@ internal fun PlayerOverlay(
}
}

DisposableEffect(isDualScreenActive) {
if (isDualScreenActive) {
DisposableEffect(isDualScreenActive, currentContentType) {
if (isDualScreenActive || currentContentType == ContentType.LIVE) {
player.repeatMode = Player.REPEAT_MODE_ONE
} else {
player.repeatMode = Player.REPEAT_MODE_OFF
Expand Down
Loading