Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Add multiview connection limit setting

David Nashash8c76dec5bbff
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt
index 31f5a5ec..46686f54 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt
@@ -140,11 +140,19 @@ class MultiViewViewModel @Inject constructor(
}
viewModelScope.launch {
- providerRepository.getActiveProvider().collect { provider ->
- val nextConnectionLimit = provider
- ?.takeIf { it.type == ProviderType.XTREAM_CODES }
- ?.maxConnections
- ?.coerceAtLeast(1)
+ combine(
+ providerRepository.getActiveProvider(),
+ preferencesRepository.multiViewRespectProviderConnectionLimit
+ ) { provider, respectProviderLimit ->
+ if (!respectProviderLimit) {
+ null
+ } else {
+ provider
+ ?.takeIf { it.type == ProviderType.XTREAM_CODES }
+ ?.maxConnections
+ ?.coerceAtLeast(1)
+ }
+ }.collect { nextConnectionLimit ->
if (activeProviderConnectionLimit != nextConnectionLimit) {
activeProviderConnectionLimit = nextConnectionLimit
if (multiViewManager.hasAnyChannel) {
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt
index 8ebae584..60d57414 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPlaybackSection.kt
@@ -333,6 +333,34 @@ internal fun LazyListScope.settingsPlaybackSection(
)
}
HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
+ TvClickableSurface(
+ onClick = {
+ viewModel.setMultiViewRespectProviderConnectionLimit(!uiState.multiViewRespectProviderConnectionLimit)
+ },
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = Color.Transparent,
+ focusedContainerColor = Primary.copy(alpha = 0.15f)
+ ),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Row(
+ modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Column(modifier = Modifier.weight(1f)) {
+ Text(text = stringResource(R.string.settings_multiview_respect_provider_connection_limit), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
+ Text(text = stringResource(R.string.settings_multiview_respect_provider_connection_limit_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
+ }
+ Switch(
+ checked = uiState.multiViewRespectProviderConnectionLimit,
+ onCheckedChange = { viewModel.setMultiViewRespectProviderConnectionLimit(it) }
+ )
+ }
+ }
+ HorizontalDivider(color = Color.White.copy(alpha = 0.07f), modifier = Modifier.padding(vertical = 4.dp))
TvClickableSurface(
onClick = { viewModel.setCenterTwoSlotMultiviewLayout(!uiState.centerTwoSlotMultiviewLayout) },
shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt
index 91b1f93e..49c1f0ab 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt
@@ -56,6 +56,7 @@ internal data class SettingsPreferenceSnapshot(
val playerAudioVideoSyncEnabled: Boolean,
val playerAudioVideoOffsetMs: Int,
val centerTwoSlotMultiviewLayout: Boolean,
+ val multiViewRespectProviderConnectionLimit: Boolean,
val playerControlsTimeoutSeconds: Int,
val playerLiveOverlayTimeoutSeconds: Int,
val playerNoticeTimeoutSeconds: Int,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt
index 6734e0b7..e20f5ec5 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt
@@ -23,6 +23,7 @@ internal fun SettingsUiState.applyPreferenceSnapshot(snapshot: SettingsPreferenc
playerAudioVideoSyncEnabled = snapshot.playerAudioVideoSyncEnabled,
playerAudioVideoOffsetMs = snapshot.playerAudioVideoOffsetMs,
centerTwoSlotMultiviewLayout = snapshot.centerTwoSlotMultiviewLayout,
+ multiViewRespectProviderConnectionLimit = snapshot.multiViewRespectProviderConnectionLimit,
playerControlsTimeoutSeconds = snapshot.playerControlsTimeoutSeconds,
playerLiveOverlayTimeoutSeconds = snapshot.playerLiveOverlayTimeoutSeconds,
playerNoticeTimeoutSeconds = snapshot.playerNoticeTimeoutSeconds,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt
index f37e0cf0..fe5f740b 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt
@@ -54,6 +54,7 @@ internal fun observeSettingsPreferenceSnapshot(
playerAudioVideoSyncEnabled = false,
playerAudioVideoOffsetMs = 0,
centerTwoSlotMultiviewLayout = false,
+ multiViewRespectProviderConnectionLimit = true,
playerControlsTimeoutSeconds = 5,
playerLiveOverlayTimeoutSeconds = 4,
playerNoticeTimeoutSeconds = 6,
@@ -135,6 +136,8 @@ internal fun observeSettingsPreferenceSnapshot(
snapshot.copy(playerAudioVideoOffsetMs = playerAudioVideoOffsetMs)
}.combine(preferencesRepository.multiViewCenterTwoSlotLayout) { snapshot, centerTwoSlotLayout ->
snapshot.copy(centerTwoSlotMultiviewLayout = centerTwoSlotLayout)
+ }.combine(preferencesRepository.multiViewRespectProviderConnectionLimit) { snapshot, respectLimit ->
+ snapshot.copy(multiViewRespectProviderConnectionLimit = respectLimit)
}.combine(preferencesRepository.playerControlsTimeoutSeconds) { snapshot, timeoutSeconds ->
snapshot.copy(playerControlsTimeoutSeconds = timeoutSeconds)
}.combine(preferencesRepository.playerLiveOverlayTimeoutSeconds) { snapshot, timeoutSeconds ->
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt
index a415980e..c03e4561 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt
@@ -75,6 +75,7 @@ data class SettingsUiState(
val playerAudioVideoSyncEnabled: Boolean = false,
val playerAudioVideoOffsetMs: Int = 0,
val centerTwoSlotMultiviewLayout: Boolean = false,
+ val multiViewRespectProviderConnectionLimit: Boolean = true,
val playerControlsTimeoutSeconds: Int = 5,
val playerLiveOverlayTimeoutSeconds: Int = 4,
val playerNoticeTimeoutSeconds: Int = 6,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
index 65e57450..371d277f 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
@@ -649,6 +649,12 @@ class SettingsViewModel @Inject constructor(
}
}
+ fun setMultiViewRespectProviderConnectionLimit(enabled: Boolean) {
+ viewModelScope.launch {
+ preferencesRepository.setMultiViewRespectProviderConnectionLimit(enabled)
+ }
+ }
+
fun setPlayerMediaSessionEnabled(enabled: Boolean) {
viewModelScope.launch {
preferencesRepository.setPlayerMediaSessionEnabled(enabled)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d9d8a04..4a99619b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -404,6 +404,8 @@
<string name="settings_audio_video_sync_default_subtitle">Positive values delay audio relative to video.</string>
<string name="settings_audio_video_sync_enabled">Enable A/V Sync Adjustment</string>
<string name="settings_audio_video_sync_enabled_subtitle">Experimental. Turn on only if audio and video are out of sync; some devices may have playback issues.</string>
+ <string name="settings_multiview_respect_provider_connection_limit">Respect provider connection limit</string>
+ <string name="settings_multiview_respect_provider_connection_limit_subtitle">Keep Split Screen and Multiview capped by the provider max-connections value. Turn off only when your provider allows multiple streams from the same IP.</string>
<string name="settings_multiview_center_two_slot_layout">Center 1-2 Channel Multiview</string>
<string name="settings_multiview_center_two_slot_layout_subtitle">When one or two multiview slots are active, center them on screen instead of using the default 2x2 grid.</string>
<string name="settings_media_session">System Media Session</string>
diff --git a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
index 895e1aa6..b474d37f 100644
--- a/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
+++ b/data/src/main/java/com/streamvault/data/manager/BackupManagerImpl.kt
@@ -96,6 +96,7 @@ class BackupManagerImpl @Inject constructor(
put("playerPlaybackSpeed", preferencesRepository.playerPlaybackSpeed.first().toString())
put("playerAudioVideoSyncEnabled", preferencesRepository.playerAudioVideoSyncEnabled.first().toString())
put("playerAudioVideoOffsetMs", preferencesRepository.playerAudioVideoOffsetMs.first().toString())
+ put("multiViewRespectProviderConnectionLimit", preferencesRepository.multiViewRespectProviderConnectionLimit.first().toString())
put("preferredAudioLanguage", preferencesRepository.preferredAudioLanguage.first() ?: "auto")
put("playerSubtitleTextScale", preferencesRepository.playerSubtitleTextScale.first().toString())
put("playerSubtitleTextColor", preferencesRepository.playerSubtitleTextColor.first().toString())
@@ -599,6 +600,8 @@ class BackupManagerImpl @Inject constructor(
prefs["playerAudioVideoOffsetMs"]?.toIntOrNull()?.let {
preferencesRepository.setPlayerAudioVideoOffsetMs(it)
}
+ prefs["multiViewRespectProviderConnectionLimit"]?.toBooleanStrictOrNull()
+ ?.let { preferencesRepository.setMultiViewRespectProviderConnectionLimit(it) }
preferencesRepository.setPreferredAudioLanguage(prefs["preferredAudioLanguage"])
prefs["playerSubtitleTextScale"]?.toFloatOrNull()?.let { preferencesRepository.setPlayerSubtitleTextScale(it) }
prefs["playerSubtitleTextColor"]?.toIntOrNull()?.let { preferencesRepository.setPlayerSubtitleTextColor(it) }
diff --git a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
index 937f0b60..41384320 100644
--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
@@ -122,6 +122,8 @@ class PreferencesRepository @Inject constructor(
val MULTIVIEW_PRESET_3 = stringPreferencesKey("multiview_preset_3")
val MULTIVIEW_PERFORMANCE_MODE = stringPreferencesKey("multiview_performance_mode")
val MULTIVIEW_CENTER_TWO_SLOT_LAYOUT = booleanPreferencesKey("multiview_center_two_slot_layout")
+ val MULTIVIEW_RESPECT_PROVIDER_CONNECTION_LIMIT =
+ booleanPreferencesKey("multiview_respect_provider_connection_limit")
val IS_INCOGNITO_MODE = booleanPreferencesKey("is_incognito_mode")
val PLAYER_MUTED = booleanPreferencesKey("player_muted")
val PLAYER_MEDIA_SESSION_ENABLED = booleanPreferencesKey("player_media_session_enabled")
@@ -1756,6 +1758,16 @@ class PreferencesRepository @Inject constructor(
}
}
+ val multiViewRespectProviderConnectionLimit: Flow<Boolean> = context.dataStore.data.map { preferences ->
+ preferences[PreferencesKeys.MULTIVIEW_RESPECT_PROVIDER_CONNECTION_LIMIT] ?: true
+ }
+
+ suspend fun setMultiViewRespectProviderConnectionLimit(enabled: Boolean) {
+ context.dataStore.edit { preferences ->
+ preferences[PreferencesKeys.MULTIVIEW_RESPECT_PROVIDER_CONNECTION_LIMIT] = enabled
+ }
+ }
+
@OptIn(ExperimentalCoroutinesApi::class)
fun getAspectRatioForChannel(channelId: Long): Flow<String?> {
return channelPreferenceDao.observeAspectRatio(channelId).flatMapLatest { persistedRatio ->
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 09c52e22..3dc1a3f2 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable product changes are recorded in this document.
- Added configurable colored remote button support for Android TV remotes, with global defaults plus playback and live-browse overrides for actions such as guide, channel info, favorites, category pinning, and split screen.
- Added QR-based provider pairing so users can scan from a phone on the same LAN, submit provider details locally, and add Xtream, Stalker, or M3U providers directly to the TV.
- Added a transparent live-TV full guide overlay that opens over player playback, reuses the EPG grid, supports category switching and search, and lets you tune channels directly from the overlay.
+- Added a playback setting to let Split Screen/Multiview ignore provider max-connection limits when a provider allows multiple streams from the same IP.
### Changed