Skip to content

Native Android client for Spotify, built with Jetpack Compose

AutoMix: plan-based mixes on in every build

kota-zoa11bc67bd8ea
diff --git a/base/app/build.gradle.kts b/base/app/build.gradle.kts
index fa4ebdd9..77ad5dcd 100644
--- a/base/app/build.gradle.kts
+++ b/base/app/build.gradle.kts
@@ -50,7 +50,6 @@ android {
versionName = version
// GitHub "owner/repo" whose releases the app checks for updates; empty = off
// (local builds). CI sets it to the repository it builds.
- buildConfigField("boolean", "AUTOMIX_LAB", automixLab.toString())
buildConfigField("String", "UPDATE_REPO", "\"${(findProperty("updateRepo") as String?) ?: System.getenv("MYSPOTI_UPDATE_REPO") ?: ""}\"")
// -Pabis=arm64-v8a: one APK for one phone (the test builds). Without it, the ABI splits below.
(findProperty("abis") as String?)?.let { ndk { abiFilters += it.split(",") } }
diff --git a/base/app/src/main/java/com/music/spotui/automix/AutoMix.kt b/base/app/src/main/java/com/music/spotui/automix/AutoMix.kt
index 729a4a8c..441c6afc 100644
--- a/base/app/src/main/java/com/music/spotui/automix/AutoMix.kt
+++ b/base/app/src/main/java/com/music/spotui/automix/AutoMix.kt
@@ -134,11 +134,11 @@ object AutoMix {
djMode = sessionDj,
)
- /** The data-plan transitions (the Mix Lab's test of them), in place of the planner; only for the beat blend style. */
- var segue by mutableStateOf(Graph.app.getSharedPreferences(PREFS, 0).getBoolean("automix_segue", app.myspoti.engine.BuildConfig.AUTOMIX_LAB))
+ /** The data-plan transitions, in place of the planner; only for the beat blend style. On unless the listener turned them off. */
+ var segue by mutableStateOf(Graph.app.getSharedPreferences(PREFS, 0).getBoolean("automix_segue", true))
private set
fun changeSegue(value: Boolean) { segue = value; Graph.app.getSharedPreferences(PREFS, 0).edit().putBoolean("automix_segue", value).apply(); com.music.spotui.di.LocalPlayer.autoMixSettingsChanged() }
- val segueActive: Boolean get() = app.myspoti.engine.BuildConfig.AUTOMIX_LAB && segue && style == 0
+ val segueActive: Boolean get() = segue && style == 0
/** The policy's decision for two analysed songs. The listener's settings may only tighten its limits. */
fun decide(a: TrackAnalysis, b: TrackAnalysis, earliestExit: Double, sameAlbum: Boolean, listener: Float): app.myspoti.automix.segue.SegueDecision {
diff --git a/base/app/src/main/java/com/music/spotui/di/LocalPlayer.kt b/base/app/src/main/java/com/music/spotui/di/LocalPlayer.kt
index 16f50dee..0992c09e 100644
--- a/base/app/src/main/java/com/music/spotui/di/LocalPlayer.kt
+++ b/base/app/src/main/java/com/music/spotui/di/LocalPlayer.kt
@@ -95,8 +95,6 @@ object LocalPlayer {
val builder = androidx.media3.exoplayer.audio.DefaultAudioSink.Builder(context)
.setEnableFloatOutput(enableFloatOutput)
.setEnableAudioTrackPlaybackParams(enableAudioTrackPlaybackParams)
- // The data plans are a test of the Mix Lab: every other build keeps its chain as it was.
- if (!app.myspoti.engine.BuildConfig.AUTOMIX_LAB) return builder.setAudioProcessors(arrayOf(EqualizerProcessor(), SpatialProcessor())).build()
val stage = com.music.spotui.automix.SegueProcessor()
lastSegueStage = stage
return com.music.spotui.automix.SegueSink(builder.setAudioProcessors(arrayOf(stage, EqualizerProcessor(), SpatialProcessor())).build(), stage)
diff --git a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt
index 6396e0ab..8dd33c3c 100644
--- a/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt
+++ b/base/app/src/main/java/com/music/spotui/ui/immersive/pages/ImmersiveSettingsScreen.kt
@@ -568,7 +568,7 @@ private fun CrossfadePage(back: () -> Unit) {
}
if (mode == TransitionMode.AUTOMIX) immersiveGroup("automix", headerRes = R.string.settings_automix_title, footerRes = R.string.settings_automix_detail) {
row {
- if (app.myspoti.engine.BuildConfig.AUTOMIX_LAB) ImmersiveSwitchRow(stringResource(R.string.settings_automix_segue), checked = automix.segue,
+ ImmersiveSwitchRow(stringResource(R.string.settings_automix_segue), checked = automix.segue,
onChecked = automix::changeSegue, detail = stringResource(R.string.settings_automix_segue_detail))
ImmersiveSwitchRow(stringResource(R.string.settings_automix_session), checked = automix.sessionDj,
onChecked = automix::changeSessionDj, detail = stringResource(R.string.settings_automix_session_detail))
diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/SettingsScreen.kt b/base/app/src/main/java/com/music/spotui/ui/screens/SettingsScreen.kt
index b58e455e..b8d5bb82 100644
--- a/base/app/src/main/java/com/music/spotui/ui/screens/SettingsScreen.kt
+++ b/base/app/src/main/java/com/music/spotui/ui/screens/SettingsScreen.kt
@@ -709,7 +709,7 @@ private fun TransitionsRow() {
if (mode == TransitionMode.AUTOMIX) {
OptionRow(stringResource(R.string.settings_automix_session), stringResource(R.string.settings_automix_session_detail),
checked = automix.sessionDj, onChecked = automix::changeSessionDj)
- if (app.myspoti.engine.BuildConfig.AUTOMIX_LAB) OptionRow(stringResource(R.string.settings_automix_segue), stringResource(R.string.settings_automix_segue_detail),
+ OptionRow(stringResource(R.string.settings_automix_segue), stringResource(R.string.settings_automix_segue_detail),
checked = automix.segue, onChecked = automix::changeSegue)
OptionRow(stringResource(R.string.settings_automix_album_order), stringResource(R.string.settings_automix_album_order_detail),
checked = automix.albumOrder, onChecked = automix::changeAlbumOrder)
diff --git a/base/app/src/main/java/com/music/spotui/ui/screens/SettingsSearch.kt b/base/app/src/main/java/com/music/spotui/ui/screens/SettingsSearch.kt
index 17cb397a..710ce0a4 100644
--- a/base/app/src/main/java/com/music/spotui/ui/screens/SettingsSearch.kt
+++ b/base/app/src/main/java/com/music/spotui/ui/screens/SettingsSearch.kt
@@ -32,6 +32,7 @@ internal object SettingsSearch {
SettingsEntry(R.string.settings_lyrics_keep_awake_title, R.string.settings_lyrics_keep_awake_detail, "Lyrics"),
SettingsEntry(R.string.lyrics_romanization, R.string.settings_lyrics_romanization_detail, "Lyrics"),
SettingsEntry(R.string.lyrics_translation_title, R.string.lyrics_translation_detail, "Lyrics"),
+ SettingsEntry(R.string.settings_automix_segue, R.string.settings_automix_segue_detail, "Crossfade"),
SettingsEntry(R.string.settings_automix_session, R.string.settings_automix_session_detail, "Crossfade"),
SettingsEntry(R.string.settings_automix_album_order, R.string.settings_automix_album_order_detail, "Crossfade"),
SettingsEntry(R.string.settings_automix_podcasts, R.string.settings_automix_podcasts_detail, "Crossfade"),
@@ -124,6 +125,7 @@ internal object SettingsSearch {
SettingsEntry(R.string.settings_transitions_title, 0, "transitions"),
SettingsEntry(R.string.equalizer_title, 0, "0"),
SettingsEntry(R.string.settings_section_data, 0, "0"),
+ SettingsEntry(R.string.settings_automix_segue, R.string.settings_automix_segue_detail, "transitions"),
SettingsEntry(R.string.settings_automix_session, R.string.settings_automix_session_detail, "transitions"),
SettingsEntry(R.string.settings_automix_album_order, R.string.settings_automix_album_order_detail, "transitions"),
SettingsEntry(R.string.settings_automix_podcasts, R.string.settings_automix_podcasts_detail, "transitions"),
diff --git a/base/app/src/main/res/values-fr/automix_session_strings.xml b/base/app/src/main/res/values-fr/automix_session_strings.xml
index 6bff7318..58e35f71 100644
--- a/base/app/src/main/res/values-fr/automix_session_strings.xml
+++ b/base/app/src/main/res/values-fr/automix_session_strings.xml
@@ -3,5 +3,5 @@
<string name="settings_automix_session">Session DJ</string>
<string name="settings_automix_session_detail">Autoriser les transitions sur un changement de section avant la fin. Désactivez pour garder davantage de chaque morceau.</string>
<string name="settings_automix_segue">Transitions planifiées</string>
- <string name="settings_automix_segue_detail">Version de test : une nouvelle façon de choisir et de jouer les transitions, avec des limites plus strictes. Une paire peut rester sans mix.</string>
+ <string name="settings_automix_segue_detail">Une nouvelle façon de choisir et de jouer les transitions, avec des limites plus strictes : une paire peut rester sans mix. Désactive pour revenir à la précédente.</string>
</resources>
diff --git a/base/app/src/main/res/values/automix_session_strings.xml b/base/app/src/main/res/values/automix_session_strings.xml
index 0f686479..09cdb35d 100644
--- a/base/app/src/main/res/values/automix_session_strings.xml
+++ b/base/app/src/main/res/values/automix_session_strings.xml
@@ -3,5 +3,5 @@
<string name="settings_automix_session">DJ session</string>
<string name="settings_automix_session_detail">Let transitions begin at a musical section before the end. Turn off to keep more of each song.</string>
<string name="settings_automix_segue">Plan-based transitions</string>
- <string name="settings_automix_segue_detail">Test build: a new way of choosing and playing transitions, with stricter limits. It may leave a pair unmixed.</string>
+ <string name="settings_automix_segue_detail">A new way of choosing and playing transitions, with stricter limits: a pair may stay unmixed. Turn off to go back to the previous one.</string>
</resources>