mirror of
https://github.com/austinried/subtracks.git
synced 2026-11-10 23:21:59 +01:00
playback: call the context-aware ReplayGain mode Auto
Rename the ReplayGainMode value, string resource and user-facing label from Dynamic to Auto. No behaviour change.
This commit is contained in:
@@ -57,7 +57,7 @@ const val MAX_REPLAY_GAIN_PREAMP_DB = 15f
|
||||
|
||||
enum class SyncMode { Off, WifiOnly, Always }
|
||||
|
||||
enum class ReplayGainMode { Off, Track, Album, Dynamic }
|
||||
enum class ReplayGainMode { Off, Track, Album, Auto }
|
||||
|
||||
data class ArtworkSeedValue(
|
||||
val cacheKey: String,
|
||||
|
||||
@@ -37,7 +37,7 @@ internal fun replayGainLinearGain(
|
||||
// headroom without a peak, so a peakless track is only ever attenuated.
|
||||
val trackPeak = gain.trackPeak?.takeIf { it.isFinite() && it > 0f }
|
||||
val albumPeak = gain.albumPeak?.takeIf { it.isFinite() && it > 0f }
|
||||
val album = settings.mode == ReplayGainMode.Album || (settings.mode == ReplayGainMode.Dynamic && albumContext)
|
||||
val album = settings.mode == ReplayGainMode.Album || (settings.mode == ReplayGainMode.Auto && albumContext)
|
||||
val (requestedDb, peak) =
|
||||
if (album) {
|
||||
(gain.albumGain ?: gain.trackGain) to (albumPeak ?: trackPeak)
|
||||
|
||||
@@ -32,7 +32,7 @@ internal fun replayGainModeLabel(
|
||||
ReplayGainMode.Off -> resources.getString(R.string.settings_replay_gain_mode_off)
|
||||
ReplayGainMode.Track -> resources.getString(R.string.settings_replay_gain_mode_track)
|
||||
ReplayGainMode.Album -> resources.getString(R.string.settings_replay_gain_mode_album)
|
||||
ReplayGainMode.Dynamic -> resources.getString(R.string.settings_replay_gain_mode_dynamic)
|
||||
ReplayGainMode.Auto -> resources.getString(R.string.settings_replay_gain_mode_auto)
|
||||
}
|
||||
|
||||
internal fun replayGainPreampLabel(
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
<string name="settings_music_options_scrobble_description_on">Send now playing and play counts</string>
|
||||
<string name="settings_music_options_scrobble_title">Scrobble to server</string>
|
||||
<string name="settings_replay_gain_mode_album">Album gain</string>
|
||||
<string name="settings_replay_gain_mode_dynamic">Dynamic</string>
|
||||
<string name="settings_replay_gain_mode_auto">Auto</string>
|
||||
<string name="settings_replay_gain_mode_off">Off</string>
|
||||
<string name="settings_replay_gain_mode_track">Track gain</string>
|
||||
<string name="settings_replay_gain_preamp_decrease">Lower preamp</string>
|
||||
|
||||
@@ -225,8 +225,8 @@ class UserPreferencesTest {
|
||||
assertEquals(ReplayGainMode.Album, prefs.replayGainMode().first())
|
||||
assertEquals(3.5f, prefs.replayGainPreampDb().first(), 0f)
|
||||
|
||||
prefs.setReplayGainMode(ReplayGainMode.Dynamic)
|
||||
assertEquals(ReplayGainMode.Dynamic, prefs.replayGainMode().first())
|
||||
prefs.setReplayGainMode(ReplayGainMode.Auto)
|
||||
assertEquals(ReplayGainMode.Auto, prefs.replayGainMode().first())
|
||||
|
||||
prefs.setReplayGainPreampDb(99f)
|
||||
assertEquals(MAX_REPLAY_GAIN_PREAMP_DB, prefs.replayGainPreampDb().first(), 0f)
|
||||
|
||||
@@ -39,8 +39,8 @@ class ReplayGainControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun dynamicModeFollowsTheItemsGainContext() {
|
||||
controller.setSettings(ReplayGainSettings(ReplayGainMode.Dynamic, 0f))
|
||||
fun autoModeFollowsTheItemsGainContext() {
|
||||
controller.setSettings(ReplayGainSettings(ReplayGainMode.Auto, 0f))
|
||||
|
||||
controller.applyItem(item("a", trackGain = -6.0206f, albumGain = -1f))
|
||||
assertEquals(0.5f, applied.last(), TOLERANCE)
|
||||
|
||||
@@ -54,12 +54,12 @@ class ReplayGainTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun dynamicModeAppliesTheAlbumGainInAnAlbumContext() {
|
||||
fun autoModeAppliesTheAlbumGainInAnAlbumContext() {
|
||||
assertEquals(
|
||||
0.5f,
|
||||
replayGainLinearGain(
|
||||
ReplayGain(trackGain = -1f, albumGain = -6.0206f, trackPeak = 1f, albumPeak = 1f),
|
||||
ReplayGainSettings(ReplayGainMode.Dynamic, 0f),
|
||||
ReplayGainSettings(ReplayGainMode.Auto, 0f),
|
||||
albumContext = true,
|
||||
),
|
||||
TOLERANCE,
|
||||
@@ -67,12 +67,12 @@ class ReplayGainTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun dynamicModeAppliesTheTrackGainInAMixedContext() {
|
||||
fun autoModeAppliesTheTrackGainInAMixedContext() {
|
||||
assertEquals(
|
||||
0.5f,
|
||||
replayGainLinearGain(
|
||||
ReplayGain(trackGain = -6.0206f, albumGain = -1f, trackPeak = 1f, albumPeak = 1f),
|
||||
ReplayGainSettings(ReplayGainMode.Dynamic, 0f),
|
||||
ReplayGainSettings(ReplayGainMode.Auto, 0f),
|
||||
albumContext = false,
|
||||
),
|
||||
TOLERANCE,
|
||||
@@ -80,8 +80,8 @@ class ReplayGainTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
fun dynamicModeFallsBackInEitherContext() {
|
||||
val settings = ReplayGainSettings(ReplayGainMode.Dynamic, 0f)
|
||||
fun autoModeFallsBackInEitherContext() {
|
||||
val settings = ReplayGainSettings(ReplayGainMode.Auto, 0f)
|
||||
|
||||
assertEquals(0.5f, replayGainLinearGain(ReplayGain(trackGain = -6.0206f), settings, albumContext = true), TOLERANCE)
|
||||
assertEquals(0.5f, replayGainLinearGain(ReplayGain(albumGain = -6.0206f), settings, albumContext = false), TOLERANCE)
|
||||
|
||||
@@ -19,7 +19,7 @@ class ReplayGainControlsTest {
|
||||
assertEquals("Off", replayGainModeLabel(resources, ReplayGainMode.Off))
|
||||
assertEquals("Track gain", replayGainModeLabel(resources, ReplayGainMode.Track))
|
||||
assertEquals("Album gain", replayGainModeLabel(resources, ReplayGainMode.Album))
|
||||
assertEquals("Dynamic", replayGainModeLabel(resources, ReplayGainMode.Dynamic))
|
||||
assertEquals("Auto", replayGainModeLabel(resources, ReplayGainMode.Auto))
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user