Skip to content

fix(android): Allow AudioFocus.none #1534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gustl22 merged 5 commits into from
Jun 12, 2023
Merged

fix(android): Allow AudioFocus.none #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed63b3f
fix!: remove invalid option "AndroidAudioFocus.none"
Gustl22 May 31, 2023
ec17178
feat: int values for AndroidAudioContext
Gustl22 May 31, 2023
5b5668c
fix(android): make audioFocus not nullable
Gustl22 May 31, 2023
5f94de2
fix(android): handle AudioFocus.none
Gustl22 Jun 12, 2023
b58fe0e
dart format
Gustl22 Jun 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/audioplayers_android/android/src/main/kotlin/xyz/luan/audioplayers/AudioContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ data class AudioContextAndroid(
val stayAwake: Boolean,
val contentType: Int,
val usageType: Int,
val audioFocus: Int?,
val audioFocus: Int,
val audioMode: Int,
) {
@SuppressLint("InlinedApi") // we are just using numerical constants
Expand All @@ -23,7 +23,7 @@ data class AudioContextAndroid(
stayAwake = false,
contentType = CONTENT_TYPE_MUSIC,
usageType = USAGE_MEDIA,
audioFocus = null,
audioFocus = AudioManager.AUDIOFOCUS_GAIN,
audioMode = AudioManager.MODE_NORMAL,
)

Expand Down
2 changes: 1 addition & 1 deletion .../audioplayers_android/android/src/main/kotlin/xyz/luan/audioplayers/AudioplayersPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ private fun MethodCall.audioContext(): AudioContextAndroid {
stayAwake = argument<Boolean>("stayAwake") ?: error("stayAwake is required"),
contentType = argument<Int>("contentType") ?: error("contentType is required"),
usageType = argument<Int>("usageType") ?: error("usageType is required"),
audioFocus = argument<Int>("audioFocus"),
audioFocus = argument<Int>("audioFocus") ?: error("audioFocus is required"),
audioMode = argument<Int>("audioMode") ?: error("audioMode is required"),
)
}
Expand Down
6 changes: 3 additions & 3 deletions ...audioplayers_android/android/src/main/kotlin/xyz/luan/audioplayers/player/FocusManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class FocusManager(
get() = player.audioManager

fun maybeRequestAudioFocus(andThen: () -> Unit) {
if (context.audioFocus == null) {
if (context.audioFocus == AudioManager.AUDIOFOCUS_NONE) {
andThen()
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
newRequestAudioFocus(andThen)
Expand All @@ -30,7 +30,7 @@ class FocusManager(
}

fun handleStop() {
if (context.audioFocus != null) {
if (context.audioFocus != AudioManager.AUDIOFOCUS_NONE) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
audioFocusRequest?.let { audioManager.abandonAudioFocusRequest(it) }
} else {
Expand Down Expand Up @@ -72,4 +72,4 @@ class FocusManager(
andThen()
}
}
}
}
3 changes: 2 additions & 1 deletion ...udioplayers_android/android/src/main/kotlin/xyz/luan/audioplayers/player/WrappedPlayer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ class WrappedPlayer internal constructor(
if (context == audioContext) {
return
}
if (context.audioFocus != null && audioContext.audioFocus == null) {
if (context.audioFocus != AudioManager.AUDIOFOCUS_NONE
&& audioContext.audioFocus == AudioManager.AUDIOFOCUS_NONE) {
focusManager.handleStop()
}
this.context = audioContext.copy()
Expand Down
Loading
⚡