From 276f991b2bd44adbe2c4031a988225eba899f9df Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Sun, 26 Sep 2021 13:42:22 -0600 Subject: [PATCH] playback: remove audiofocus duck fadeout Remove the ducking fadeout code from AudioReactor. This is mostly because: 1. Android 12 now does this automatically 2. It caused a ton of annoying bugs --- .../auxio/playback/system/AudioReactor.kt | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt b/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt index a4f649ab6..d1a548d05 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/system/AudioReactor.kt @@ -18,10 +18,8 @@ package org.oxycblt.auxio.playback.system -import android.animation.ValueAnimator import android.content.Context import android.media.AudioManager -import androidx.core.animation.addListener import androidx.media.AudioFocusRequestCompat import androidx.media.AudioManagerCompat import com.google.android.exoplayer2.SimpleExoPlayer @@ -33,7 +31,6 @@ import org.oxycblt.auxio.util.logD /** * Object that manages the AudioFocus state. * Adapted from NewPipe (https://github.com/TeamNewPipe/NewPipe) - * FIXME: remove the janky audio fadeout code, it just does not work. * @author OxygenCobalt */ class AudioReactor( @@ -116,26 +113,11 @@ class AudioReactor( private fun unduck() { logD("Unducking, raising volume") - player.volume = VOLUME_DUCK - - ValueAnimator().apply { - setFloatValues(VOLUME_DUCK, VOLUME_FULL) - duration = DUCK_DURATION - addListener( - onStart = { player.volume = VOLUME_DUCK }, - onCancel = { player.volume = VOLUME_FULL }, - onEnd = { player.volume = VOLUME_FULL } - ) - addUpdateListener { - player.volume = animatedValue as Float - } - start() - } + player.volume = VOLUME_FULL } companion object { private const val VOLUME_DUCK = 0.2f - private const val DUCK_DURATION = 1500L private const val VOLUME_FULL = 1.0f } }