Track audio focus state so music never plays without focus

This commit is contained in:
2026-10-14 11:22:25 +00:00
parent 841b561fd8
commit 5c0f80247f
@@ -48,6 +48,7 @@ object SoundManager {
private var connectTimeoutRunnable: Runnable? = null private var connectTimeoutRunnable: Runnable? = null
private var audioManager: AudioManager? = null private var audioManager: AudioManager? = null
private var focusRequest: AudioFocusRequest? = null private var focusRequest: AudioFocusRequest? = null
private var focusGranted = false
private var noisyReceiverRegistered = false private var noisyReceiverRegistered = false
private val mainHandler = Handler(Looper.getMainLooper()) private val mainHandler = Handler(Looper.getMainLooper())
@@ -97,6 +98,7 @@ object SoundManager {
abandonAudioFocus() abandonAudioFocus()
} }
AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> { AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
focusGranted = false
pauseRadio() pauseRadio()
pauseMenuMusic() pauseMenuMusic()
} }
@@ -105,13 +107,14 @@ object SoundManager {
runCatching { menuPlayer?.setVolume(BASE_VOLUME * 0.3f, BASE_VOLUME * 0.3f) } runCatching { menuPlayer?.setVolume(BASE_VOLUME * 0.3f, BASE_VOLUME * 0.3f) }
} }
AudioManager.AUDIOFOCUS_GAIN -> { AudioManager.AUDIOFOCUS_GAIN -> {
focusGranted = true
val player = musicPlayer val player = musicPlayer
if (player != null && playerPrepared) runCatching { if (player != null && playerPrepared) runCatching {
player.setVolume(BASE_VOLUME, BASE_VOLUME) player.setVolume(BASE_VOLUME, BASE_VOLUME)
if (!player.isPlaying) player.start() if (!player.isPlaying) player.start()
} }
val menu = menuPlayer val menu = menuPlayer
if (menu != null && menuPrepared && menuVisible) runCatching { if (menu != null && menuPrepared && shouldPlayMenuMusic()) runCatching {
menu.setVolume(BASE_VOLUME, BASE_VOLUME) menu.setVolume(BASE_VOLUME, BASE_VOLUME)
if (!menu.isPlaying) menu.start() if (!menu.isPlaying) menu.start()
} }
@@ -143,23 +146,27 @@ object SoundManager {
private fun requestAudioFocus(): Boolean { private fun requestAudioFocus(): Boolean {
val am = audioManager ?: return false val am = audioManager ?: return false
if (focusRequest != null) return true if (focusGranted) return true
val attrs = AudioAttributes.Builder() // Asked again after a denial or a transient loss, e.g. during a phone call
.setUsage(AudioAttributes.USAGE_MEDIA) val request = focusRequest ?: AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
.setContentType(AudioAttributes.CONTENT_TYPE_MUSIC) .setAudioAttributes(
.build() AudioAttributes.Builder()
val request = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN) .setUsage(AudioAttributes.USAGE_MEDIA)
.setAudioAttributes(attrs) .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
.build()
)
.setOnAudioFocusChangeListener(focusChangeListener, mainHandler) .setOnAudioFocusChangeListener(focusChangeListener, mainHandler)
.build() .build()
focusRequest = request .also { focusRequest = it }
return am.requestAudioFocus(request) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED focusGranted = am.requestAudioFocus(request) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
return focusGranted
} }
private fun abandonAudioFocus() { private fun abandonAudioFocus() {
val am = audioManager ?: return val am = audioManager ?: return
focusRequest?.let { am.abandonAudioFocusRequest(it) } focusRequest?.let { am.abandonAudioFocusRequest(it) }
focusRequest = null focusRequest = null
focusGranted = false
} }
private fun registerNoisyReceiver() { private fun registerNoisyReceiver() {
@@ -339,10 +346,11 @@ object SoundManager {
} }
private fun updateMenuMusic() { private fun updateMenuMusic() {
val shouldPlay = menuMusicEnabled && !musicEnabled && menuVisible && appInForeground if (shouldPlayMenuMusic()) startMenuMusic() else pauseMenuMusicAndFocus()
if (shouldPlay) startMenuMusic() else pauseMenuMusicAndFocus()
} }
private fun shouldPlayMenuMusic() = menuMusicEnabled && !musicEnabled && menuVisible && appInForeground
private fun pauseMenuMusicAndFocus() { private fun pauseMenuMusicAndFocus() {
pauseMenuMusic() pauseMenuMusic()
if (!musicEnabled) abandonAudioFocus() if (!musicEnabled) abandonAudioFocus()
@@ -385,15 +393,13 @@ object SoundManager {
player.setVolume(BASE_VOLUME, BASE_VOLUME) player.setVolume(BASE_VOLUME, BASE_VOLUME)
player.setOnPreparedListener { player.setOnPreparedListener {
menuPrepared = true menuPrepared = true
if (menuVisible && appInForeground && menuMusicEnabled && !musicEnabled) it.start() if (shouldPlayMenuMusic()) it.start()
} }
player.setOnCompletionListener { mp -> player.setOnCompletionListener { mp ->
if (menuPlayer === mp) { if (menuPlayer === mp) {
releaseMenuPlayer() releaseMenuPlayer()
menuTrackIndex = (menuTrackIndex + 1) % menuTracks.size menuTrackIndex = (menuTrackIndex + 1) % menuTracks.size
if (menuVisible && appInForeground && menuMusicEnabled && !musicEnabled) { if (shouldPlayMenuMusic()) playMenuTrack(menuTrackIndex)
playMenuTrack(menuTrackIndex)
}
} }
} }
player.setOnErrorListener { mp, _, _ -> player.setOnErrorListener { mp, _, _ ->