diff --git a/app/src/main/assets/steam-startup/skip-startup.webm b/app/src/main/assets/steam-startup/skip-startup.webm
new file mode 100644
index 0000000000..3853967ad7
Binary files /dev/null and b/app/src/main/assets/steam-startup/skip-startup.webm differ
diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt
index a525bed375..148766436c 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovie.kt
@@ -15,6 +15,7 @@ object BootMovie {
const val DROIDDECK_30 = "dd30"
const val DROIDDECK_60 = "dd60"
const val CUSTOM = "custom"
+ private const val SKIP = "skip"
const val MAX_BYTES = 50L shl 20
const val MAX_CONVERT_SECONDS = 60
val PICKER_EXTENSIONS = listOf("webm", "mkv", "mp4", "mov", "m4v", "3gp")
@@ -22,6 +23,7 @@ object BootMovie {
private val ASSETS = mapOf(
DROIDDECK_30 to "droiddeck-startup.webm",
DROIDDECK_60 to "droiddeck-startup-60.webm",
+ SKIP to "skip-startup.webm",
)
internal val VIDEO_CODECS = setOf(MediaFormat.MIMETYPE_VIDEO_VP8, MediaFormat.MIMETYPE_VIDEO_VP9, MediaFormat.MIMETYPE_VIDEO_AV1)
@@ -74,6 +76,7 @@ object BootMovie {
fun prepare(context: Context): File? {
BootMovieLibrary.restore(context)
+ if (SessionPrefs.skipBootMovie(context)) return assetFile(context, SKIP)
val source = sourceOf(context, choice(context)) ?: return null
return variant(context, source)
}
diff --git a/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt b/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt
index 18ff31169d..b82dad26d2 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/BootMovieReport.kt
@@ -67,7 +67,7 @@ object BootMovieReport {
line("== DroidDeck state")
line("choice=${BootMovie.choice(context)} saved choice=${SessionPrefs.bootMovie(context)} pending pick=${SessionPrefs.bootMovieApplyNext(context)}")
line("last Steam path seen=${SessionPrefs.bootMovieSteamSeen(context)}")
- line("sound=${SessionPrefs.bootMovieSound(context)} volume=${SessionPrefs.bootMovieVolume(context)} seconds=${SessionPrefs.bootMovieSeconds(context)}")
+ line("sound=${SessionPrefs.bootMovieSound(context)} volume=${SessionPrefs.bootMovieVolume(context)} seconds=${SessionPrefs.bootMovieSeconds(context)} skip=${SessionPrefs.skipBootMovie(context)}")
line("session running=${SessionState.running}")
line()
line("== The movie list as shown")
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt
index cf7b324eac..faf6a6674f 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt
@@ -1164,6 +1164,11 @@ object SessionPrefs {
fun setBootMovieVolume(context: Context, percent: Int) { prefs(context).edit().putInt("bootMovieVolume", percent.coerceIn(0, 100)).apply() }
fun bootMovieSeconds(context: Context): Int = prefs(context).getInt("bootMovieSeconds", 0).coerceAtLeast(0)
fun setBootMovieSeconds(context: Context, seconds: Int) { prefs(context).edit().putInt("bootMovieSeconds", seconds.coerceAtLeast(0)).apply() }
+ fun skipBootMovie(context: Context): Boolean = prefs(context).getBoolean("skipBootMovie", false)
+ fun setSkipBootMovie(context: Context, on: Boolean) {
+ prefs(context).edit().putBoolean("skipBootMovie", on).apply()
+ setBootMovieApplyNext(context, true)
+ }
fun bootMovieApplyNext(context: Context): Boolean = prefs(context).getBoolean("bootMovieApplyNext", false)
fun setBootMovieApplyNext(context: Context, on: Boolean) { prefs(context).edit().putBoolean("bootMovieApplyNext", on).apply() }
fun bootMovieSteamSeen(context: Context): String? = prefs(context).getString("bootMovieSteamSeen", null)
diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt
index 7e4053a14a..2c600dafee 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt
@@ -25,7 +25,7 @@ object SettingsReset {
"noXalia", "fastSync", "fsyncFirst", "syncFallback", "prootNoSeccomp", "prootFastPath", "nativeUserland", "cursorComposite",
"guestHostname", "fexPreset", "forceSsbs", "logs", "gameDebugLogsEnabled", "enhancedDiagnosticsNext", "storageDiagnostics", "buildWatermark",
"upscaler", "upscaleSharpness", "screenEffects", "textureAnisotropy", "textureLodBias",
- "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds",
+ "steamDownloadsInBackground", "steam_offline", "bootMovie", "bootMovieSound", "bootMovieVolume", "bootMovieSeconds", "skipBootMovie",
"bootMovieApplyNext", "bootMovieSteamSeen",
"questDefaultsV1", "telemetryAuto", "telemetryOff", "statsStrip", "statsHud", "bottomHud", "bottomStripMetrics", "bottomStripTabs", "statsDash", "statsSpeedUnit",
)
diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt
index 8e84ae4cbf..9e915031f2 100644
--- a/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt
+++ b/app/src/main/java/com/droiddeck/launcher/ui/BootMovieSection.kt
@@ -142,18 +142,29 @@ private fun TabChip(label: String, selected: Boolean, modifier: Modifier = Modif
@Composable
internal fun BootMovieGroup(s: ModeSettings, a: ModeSettingsActions, host: MenuHost) {
var tab by rememberSaveable { mutableStateOf(MovieTab.INSTALLED) }
+ val app = LocalContext.current.applicationContext
+ var skipBootMovie by remember { mutableStateOf(SessionPrefs.skipBootMovie(app)) }
SettingsGroup(stringResource(R.string.boot_movie)) {
- Row(horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 10.dp)) {
- TabChip(stringResource(R.string.boot_movie_tab_installed), tab == MovieTab.INSTALLED, Modifier.weight(1f)) { tab = MovieTab.INSTALLED }
- TabChip(stringResource(R.string.boot_movie_tab_import), tab == MovieTab.IMPORT, Modifier.weight(1f)) { tab = MovieTab.IMPORT }
- TabChip(stringResource(R.string.boot_movie_tab_repo), tab == MovieTab.REPO, Modifier.weight(1f)) { tab = MovieTab.REPO }
- TabChip(stringResource(R.string.boot_movie_tab_sound), tab == MovieTab.SOUND, Modifier.weight(1f)) { tab = MovieTab.SOUND }
+ ToggleRow(
+ host, "boot-movie-skip", stringResource(R.string.boot_movie_skip),
+ stringResource(R.string.boot_movie_skip_hint), skipBootMovie,
+ ) { enabled ->
+ skipBootMovie = enabled
+ SessionPrefs.setSkipBootMovie(app, enabled)
}
- when (tab) {
- MovieTab.INSTALLED -> InstalledTab(a)
- MovieTab.IMPORT -> ImportTab(s, a)
- MovieTab.REPO -> RepoTab(a)
- MovieTab.SOUND -> SoundTab(s, a, host)
+ if (!skipBootMovie) {
+ Row(horizontalArrangement = Arrangement.spacedBy(6.dp), modifier = Modifier.fillMaxWidth().padding(horizontal = 10.dp, vertical = 10.dp)) {
+ TabChip(stringResource(R.string.boot_movie_tab_installed), tab == MovieTab.INSTALLED, Modifier.weight(1f)) { tab = MovieTab.INSTALLED }
+ TabChip(stringResource(R.string.boot_movie_tab_import), tab == MovieTab.IMPORT, Modifier.weight(1f)) { tab = MovieTab.IMPORT }
+ TabChip(stringResource(R.string.boot_movie_tab_repo), tab == MovieTab.REPO, Modifier.weight(1f)) { tab = MovieTab.REPO }
+ TabChip(stringResource(R.string.boot_movie_tab_sound), tab == MovieTab.SOUND, Modifier.weight(1f)) { tab = MovieTab.SOUND }
+ }
+ when (tab) {
+ MovieTab.INSTALLED -> InstalledTab(a)
+ MovieTab.IMPORT -> ImportTab(s, a)
+ MovieTab.REPO -> RepoTab(a)
+ MovieTab.SOUND -> SoundTab(s, a, host)
+ }
}
}
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e59c9e0bdc..ecbc309951 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3532,6 +3532,8 @@
DroidDeck · %1$d fps
60 fps looks smoother but uses more CPU while Steam starts. A movie picked in Steam\'s own settings shows up here too.
Sound
+ Skip boot movie
+ Use a 0.1-second black clip as Steam’s startup movie. Applies next session.
Your own movie
MP4, MOV, MKV or WebM. Other formats and files over %1$d MB are converted to 720p WebM on the device, up to %2$d seconds.
Import