Skip to content

Commit f916d6c

Browse files
authored
Share eagerly current player (#1227)
1 parent a52d354 commit f916d6c

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

pillarbox-cast/src/main/java/ch/srgssr/pillarbox/cast/CastPlayerSynchronizer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class CastPlayerSynchronizer(
4747
.map { if (it) castPlayer else localPlayer }
4848
.distinctUntilChanged()
4949
.onEach { switchPlayer(it) }
50-
.stateIn(coroutineScope, SharingStarted.WhileSubscribed(5_000), if (castContext.isConnected()) castPlayer else localPlayer)
50+
.stateIn(coroutineScope, SharingStarted.Eagerly, if (castContext.isConnected()) castPlayer else localPlayer)
5151

5252
private fun switchPlayer(player: PillarboxPlayer) {
5353
val oldPlayer = if (player is PillarboxCastPlayer) localPlayer else castPlayer

pillarbox-demo/src/main/java/ch/srgssr/pillarbox/demo/ui/showcases/integrations/cast/CastShowcase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import androidx.compose.foundation.layout.fillMaxSize
1111
import androidx.compose.foundation.layout.fillMaxWidth
1212
import androidx.compose.material3.IconButtonColors
1313
import androidx.compose.runtime.Composable
14-
import androidx.compose.runtime.collectAsState
1514
import androidx.compose.runtime.getValue
1615
import androidx.compose.ui.Alignment
1716
import androidx.compose.ui.Modifier
1817
import androidx.compose.ui.graphics.Color
18+
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1919
import androidx.lifecycle.viewmodel.compose.viewModel
2020
import ch.srgssr.media.maestro.MediaRouteButton
2121
import ch.srgssr.pillarbox.demo.shared.data.samples.SamplesGoogle
@@ -30,7 +30,7 @@ import ch.srgssr.pillarbox.demo.ui.player.playlist.PlaylistView
3030
@Composable
3131
fun CastShowcase() {
3232
val mainViewModel: CastShowcaseViewModel = viewModel()
33-
val player by mainViewModel.currentPlayer.collectAsState()
33+
val player by mainViewModel.currentPlayer.collectAsStateWithLifecycle()
3434

3535
Column {
3636
Box(

0 commit comments

Comments
 (0)