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

- Set volume controls to apply to current audio stream (may not always work)

Browse Source 
- Audio focus implementation changes
This commit is contained in:
Juha Heinanen
2019-04-10 12:46:51 +03:00
parent 95e682a190
commit 404eb979bf
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,20 +330,18 @@ class BaresipService: Service() {
else
status[account_index] = R.drawable.dot_green
updateStatusNotification()
if (!Utils.isVisible())
return
}
"registering failed" -> {
status[account_index] = R.drawable.dot_red
updateStatusNotification()
if (!Utils.isVisible())
return
}
"unregistering" -> {
status[account_index] = R.drawable.dot_yellow
updateStatusNotification()
if (!Utils.isVisible())
return
}
"call ringing" -> {
am.mode = AudioManager.MODE_IN_COMMUNICATION
requestAudioFocus(AudioManager.STREAM_VOICE_CALL)
}
"call incoming" -> {
val peerUri = Api.call_peeruri(callp)
@ -412,12 +410,12 @@ class BaresipService: Service() {
CallHistory.add(CallHistory(aor, call.peerURI, call.dir, true))
CallHistory.save(filesPath)
call.hasHistory = true
stopRinging()
am.mode = AudioManager.MODE_IN_COMMUNICATION
requestAudioFocus(AudioManager.STREAM_VOICE_CALL)
am.isSpeakerphoneOn = false
if (!Utils.isVisible())
return
if (call.dir == "in")
stopRinging()
if (!isAudioFocused()) {
am.mode = AudioManager.MODE_IN_COMMUNICATION
requestAudioFocus(AudioManager.STREAM_VOICE_CALL)
}
}
"call verified", "call secure" -> {
val call = Call.find(callp)
@ -431,8 +429,6 @@ class BaresipService: Service() {
call.security = R.drawable.box_green
call.zid = ev[1]
}
if (!Utils.isVisible())
return
}
"call transfer" -> {
val call = Call.find(callp)
@ -489,7 +485,8 @@ class BaresipService: Service() {
return
}
Log.d(LOG_TAG, "AoR $aor call $callp is closed")
stopRinging()
if (call.status == "incoming")
stopRinging()
calls.remove(call)
if (!call.hasHistory) {
CallHistory.add(CallHistory(aor, call.peerURI, call.dir, false))
@ -497,16 +494,11 @@ class BaresipService: Service() {
if (call.dir == "in") ua.account.missedCalls = true
}
if (Call.calls().size == 0) {
abandonAudioFocus()
am.mode = AudioManager.MODE_NORMAL
if (am.isSpeakerphoneOn) am.isSpeakerphoneOn = false
if (audioFocused) abandonAudioFocus()
speakerPhone = false
}
if (speakerPhone) {
am.isSpeakerphoneOn = !am.isSpeakerphoneOn
speakerPhone = am.isSpeakerphoneOn
}
if (!Utils.isVisible())
return
}
"transfer failed" -> {
Log.d(LOG_TAG, "AoR $aor hanging up call $callp with ${ev[1]}")
@ -516,6 +508,8 @@ class BaresipService: Service() {
}
}
}
if (!Utils.isVisible())
return
if (newEvent == null) newEvent = event
val intent = Intent("service event")
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or
@ -695,6 +689,13 @@ class BaresipService: Service() {
}
}
private fun isAudioFocused(): Boolean {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
return audioFocusRequest != null
else
return audioFocused
}
private fun abandonAudioFocus() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (audioFocusRequest != null) {
@ -728,8 +729,8 @@ class BaresipService: Service() {
rtTimer!!.cancel()
rtTimer = null
if (rt.isPlaying) rt.stop()
abandonAudioFocus()
}
abandonAudioFocus()
}
private fun cleanService() {
@ -772,6 +773,7 @@ class BaresipService: Service() {
var disconnected = false
var libraryLoaded = false
var isServiceClean = false
var speakerPhone = false
var uas = ArrayList<UserAgent>()
var status = ArrayList<Int>()
@ -781,8 +783,6 @@ class BaresipService: Service() {
var contacts = ArrayList<Contact>()
var chatTexts: MutableMap<String, String> = mutableMapOf<String, String>()
var speakerPhone = false
}
init {

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

@ -13,6 +13,7 @@ import android.util.Log
import android.view.Menu
import android.view.MenuItem
import android.content.pm.PackageManager
import android.media.AudioManager
import android.os.Build
import android.os.CountDownTimer
import android.support.v4.content.LocalBroadcastManager
@ -568,6 +569,7 @@ class MainActivity : AppCompatActivity() {
Toast.LENGTH_LONG).show()
}
"call ringing" -> {
setVolumeControlStream(AudioManager.STREAM_VOICE_CALL)
}
"call rejected" -> {
if (ua == UserAgent.uas()[aorSpinner.selectedItemPosition]) {
@ -590,6 +592,7 @@ class MainActivity : AppCompatActivity() {
Log.e("Baresip", "Incoming call $callp not found")
return
}
setVolumeControlStream(AudioManager.STREAM_RING)
if ((aorSpinner.selectedItemPosition == -1) ||
(ua != UserAgent.uas()[aorSpinner.selectedItemPosition])) {
aorSpinner.setSelection(account_index)
@ -622,6 +625,7 @@ class MainActivity : AppCompatActivity() {
Log.e("Baresip", "Established call $callp not found")
return
}
setVolumeControlStream(AudioManager.STREAM_VOICE_CALL)
if (ua == UserAgent.uas()[aorSpinner.selectedItemPosition]) {
if (call.dir == "in")
callTitle.text = "Incoming call from ..."