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

Minor AudioManager related improvements

Browse Source
This commit is contained in:
Juha Heinanen
2021-07-19 14:47:44 +03:00
parent 7eab6efd02
commit f4ac3e9936
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ import java.util.*
import kotlin.concurrent.schedule
import kotlin.math.roundToInt
class BaresipService: Service() {
internal lateinit var intent: Intent
@ -67,6 +68,8 @@ class BaresipService: Service() {
filesPath = filesDir.absolutePath
am = getSystemService(Context.AUDIO_SERVICE) as AudioManager
// Hack to avoid playback delay when outgoing call is established
am.mode = AudioManager.MODE_IN_COMMUNICATION
val rtUri = RingtoneManager.getActualDefaultRingtoneUri(applicationContext,
RingtoneManager.TYPE_RINGTONE)
@ -511,7 +514,8 @@ class BaresipService: Service() {
return
}
"call progress", "call ringing" -> {
requestAudioFocus(AudioAttributes.USAGE_VOICE_COMMUNICATION)
requestAudioFocus(AudioAttributes.USAGE_VOICE_COMMUNICATION,
AudioAttributes.CONTENT_TYPE_SPEECH)
setCallVolume()
return
}
@ -602,6 +606,7 @@ class BaresipService: Service() {
}
}
"call answered" -> {
stopRinging()
proximitySensing(true)
return
}
@ -620,8 +625,8 @@ class BaresipService: Service() {
CallHistory.save()
call.hasHistory = true
}
stopRinging()
requestAudioFocus(AudioAttributes.USAGE_VOICE_COMMUNICATION)
requestAudioFocus(AudioAttributes.USAGE_VOICE_COMMUNICATION,
AudioAttributes.CONTENT_TYPE_SPEECH)
setCallVolume()
if (!Utils.isVisible())
return
@ -939,7 +944,7 @@ class BaresipService: Service() {
return spannable
}
private fun requestAudioFocus(usage: Int) {
private fun requestAudioFocus(usage: Int, type: Int) {
if (audioFocusUsage != -1) {
if (audioFocusUsage == usage)
return
@ -952,6 +957,7 @@ class BaresipService: Service() {
.run {
setAudioAttributes(AudioAttributes.Builder().run {
setUsage(usage)
setContentType(type)
build()
})
build()
@ -1021,7 +1027,8 @@ class BaresipService: Service() {
private fun startRinging() {
am.mode = AudioManager.MODE_RINGTONE
requestAudioFocus(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
requestAudioFocus(AudioAttributes.USAGE_NOTIFICATION_RINGTONE,
AudioAttributes.CONTENT_TYPE_MUSIC)
if (VERSION.SDK_INT >= 28) {
rt.isLooping = true
rt.play()
@ -1034,12 +1041,13 @@ class BaresipService: Service() {
rt.play()
}
}
}, 1000 * 1, 1000 * 1)
}, 1000, 1000)
}
}
private fun stopRinging() {
if (am.mode == AudioManager.MODE_RINGTONE) {
abandonAudioFocus()
if ((VERSION.SDK_INT < 28) && (rtTimer != null)) {
rtTimer!!.cancel()
rtTimer = null

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

@ -644,12 +644,10 @@ class MainActivity : AppCompatActivity() {
delegate.applyDayNight()
}
if (am.mode == AudioManager.MODE_RINGTONE) {
if (am.mode == AudioManager.MODE_RINGTONE)
volumeControlStream = AudioManager.STREAM_RING
} else {
am.mode = AudioManager.MODE_IN_COMMUNICATION
else
volumeControlStream = AudioManager.STREAM_VOICE_CALL
}
} // OnCreate