jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplified abandoning audio focus

Browse Source
This commit is contained in:
Juha Heinanen
2023-04-15 07:26:33 +03:00
parent 01bef1ca0b
commit 0e5ba4e559
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
View File

@ -889,9 +889,7 @@ class BaresipService: Service() {
call.remove()
if (!Call.inCall()) {
resetCallVolume()
if (!abandonAudioFocus(applicationContext))
Log.e(TAG, "Failed to abandon audio focus")
am.mode = MODE_NORMAL
abandonAudioFocus(applicationContext)
proximitySensing(false)
}
val missed = call.startTime == null && call.dir == "in" && !call.rejected
@ -1446,8 +1444,8 @@ class BaresipService: Service() {
this.unregisterReceiver(bluetoothReceiver)
this.unregisterReceiver(hotSpotReceiver)
stopRinging()
abandonAudioFocus(applicationContext)
stopMediaPlayer()
abandonAudioFocus(applicationContext)
uas.clear()
callHistory.clear()
messages.clear()
@ -1535,18 +1533,20 @@ class BaresipService: Service() {
return audioFocusRequest != null
}
fun abandonAudioFocus(ctx: Context): Boolean {
fun abandonAudioFocus(ctx: Context) {
val am = ctx.getSystemService(Context.AUDIO_SERVICE) as AudioManager
if (audioFocusRequest != null) {
Log.d(TAG, "Abandoning audio focus")
val am = ctx.getSystemService(Context.AUDIO_SERVICE) as AudioManager
if (AudioManagerCompat.abandonAudioFocusRequest(am, audioFocusRequest!!) ==
AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
audioFocusRequest = null
if (isBluetoothHeadsetConnected(ctx))
stopBluetoothSco(ctx)
} else {
Log.e(TAG, "Failed to abandon audio focus")
}
}
return audioFocusRequest == null
am.mode = MODE_NORMAL
}
private fun isBluetoothHeadsetConnected(ctx: Context): Boolean {

6
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -364,7 +364,6 @@ class MainActivity : AppCompatActivity() {
callHandler.removeCallbacks(callRunnable!!)
callRunnable = null
BaresipService.abandonAudioFocus(applicationContext)
am.mode = AudioManager.MODE_NORMAL
showCall(ua)
return@setOnClickListener
}
@ -373,7 +372,6 @@ class MainActivity : AppCompatActivity() {
am.removeOnModeChangedListener(audioModeChangedListener!!)
audioModeChangedListener = null
BaresipService.abandonAudioFocus(applicationContext)
am.mode = AudioManager.MODE_NORMAL
showCall(ua)
return@setOnClickListener
}
@ -1803,8 +1801,6 @@ class MainActivity : AppCompatActivity() {
onHoldCall.newCall = null
call.remove()
call.destroy()
if (!BaresipService.abandonAudioFocus(applicationContext))
Log.e(TAG, "Failed to abandon audio focus")
showCall(ua)
false
}
@ -1925,7 +1921,7 @@ class MainActivity : AppCompatActivity() {
callRunnable = Runnable {
callRunnable = null
if (!call(ua, uri)) {
am.mode = AudioManager.MODE_NORMAL
BaresipService.abandonAudioFocus(applicationContext)
callButton.visibility = View.VISIBLE
callButton.isEnabled = true
hangupButton.visibility = View.INVISIBLE