diff --git a/CHANGELOG.md b/CHANGELOG.md index 6024de838..211c9841f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Fixed the queue list being non-scrollable in certain cases - Fixed notification album covers not updating after changing the cover aspect ratio setting +- Fixed negative ReplayGain adjustments not being applied #### Dev/Meta - Unified navigation graph diff --git a/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt b/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt index 7d1ac68d1..b1a19d52a 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/cache/CacheDatabase.kt @@ -32,7 +32,7 @@ import org.oxycblt.auxio.music.info.Date import org.oxycblt.auxio.music.metadata.correctWhitespace import org.oxycblt.auxio.music.metadata.splitEscaped -@Database(entities = [CachedSong::class], version = 32, exportSchema = false) +@Database(entities = [CachedSong::class], version = 34, exportSchema = false) abstract class CacheDatabase : RoomDatabase() { abstract fun cachedSongsDao(): CachedSongsDao } diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt index fae02585e..b37ef122e 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt @@ -314,7 +314,11 @@ private class TagWorkerImpl( * @return A parsed adjustment float, or null if the adjustment had invalid formatting. */ private fun List.parseReplayGainAdjustment() = - first().replace(REPLAYGAIN_ADJUSTMENT_FILTER_REGEX, "").toFloatOrNull()?.nonZeroOrNull() + first() + .replace(REPLAYGAIN_ADJUSTMENT_FILTER_REGEX, "") + .toFloatOrNull() + ?.nonZeroOrNull() + .also { logD(it) } private companion object { val COMPILATION_ALBUM_ARTISTS = listOf("Various Artists") diff --git a/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt index 3ad2f8eb1..de542ef9b 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt @@ -55,7 +55,7 @@ fun Long.nonZeroOrNull() = if (this > 0) this else null * * @return The same number if it's non-zero, null otherwise. */ -fun Float.nonZeroOrNull() = if (this > 0) this else null +fun Float.nonZeroOrNull() = if (this != 0f) this else null /** * Aliases a check to ensure a given value is in a specified range.