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
This commit is contained in:
parent
7a17282c30
commit
276f991b2b
1 changed files with 1 additions and 19 deletions
|
|
@ -18,10 +18,8 @@
|
||||||
|
|
||||||
package org.oxycblt.auxio.playback.system
|
package org.oxycblt.auxio.playback.system
|
||||||
|
|
||||||
import android.animation.ValueAnimator
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.media.AudioManager
|
import android.media.AudioManager
|
||||||
import androidx.core.animation.addListener
|
|
||||||
import androidx.media.AudioFocusRequestCompat
|
import androidx.media.AudioFocusRequestCompat
|
||||||
import androidx.media.AudioManagerCompat
|
import androidx.media.AudioManagerCompat
|
||||||
import com.google.android.exoplayer2.SimpleExoPlayer
|
import com.google.android.exoplayer2.SimpleExoPlayer
|
||||||
|
|
@ -33,7 +31,6 @@ import org.oxycblt.auxio.util.logD
|
||||||
/**
|
/**
|
||||||
* Object that manages the AudioFocus state.
|
* Object that manages the AudioFocus state.
|
||||||
* Adapted from NewPipe (https://github.com/TeamNewPipe/NewPipe)
|
* Adapted from NewPipe (https://github.com/TeamNewPipe/NewPipe)
|
||||||
* FIXME: remove the janky audio fadeout code, it just does not work.
|
|
||||||
* @author OxygenCobalt
|
* @author OxygenCobalt
|
||||||
*/
|
*/
|
||||||
class AudioReactor(
|
class AudioReactor(
|
||||||
|
|
@ -116,26 +113,11 @@ class AudioReactor(
|
||||||
private fun unduck() {
|
private fun unduck() {
|
||||||
logD("Unducking, raising volume")
|
logD("Unducking, raising volume")
|
||||||
|
|
||||||
player.volume = VOLUME_DUCK
|
player.volume = VOLUME_FULL
|
||||||
|
|
||||||
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()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val VOLUME_DUCK = 0.2f
|
private const val VOLUME_DUCK = 0.2f
|
||||||
private const val DUCK_DURATION = 1500L
|
|
||||||
private const val VOLUME_FULL = 1.0f
|
private const val VOLUME_FULL = 1.0f
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue