- Fixed restoring of volume to original level if default call volume is in use.

This commit is contained in:
Juha Heinanen
2019-05-22 15:24:55 +03:00
parent b93733cabc
commit 4a2d9e5309
3 changed files with 7 additions and 6 deletions

View File

@ -8,8 +8,8 @@ android {
applicationId = 'com.tutpro.baresip'
minSdkVersion 21
targetSdkVersion 28
versionCode = 62
versionName = '8.0.0'
versionCode = 63
versionName = '8.0.1'
externalNativeBuild {
cmake {
cFlags '-DHAVE_INTTYPES_H'

View File

@ -41,7 +41,7 @@ class BaresipService: Service() {
internal var rtTimer: Timer? = null
internal var audioFocusRequest: AudioFocusRequest? = null
internal var audioFocused = false
internal var origCallVolume = 0
internal var origCallVolume = -1
override fun onCreate() {
@ -393,7 +393,7 @@ class BaresipService: Service() {
requestAudioFocus(AudioManager.STREAM_VOICE_CALL)
}
if (callVolume != 0) {
origCallVolume = am.getStreamMaxVolume(am.mode)
origCallVolume = am.getStreamVolume(am.mode)
am.setStreamVolume(am.mode,
(callVolume * 0.1 * am.getStreamMaxVolume(am.mode)).roundToInt(),
0)
@ -480,9 +480,9 @@ class BaresipService: Service() {
}
if (Call.calls().size == 0) {
abandonAudioFocus()
if (origCallVolume != 0) {
if (origCallVolume != -1) {
am.setStreamVolume(am.mode, origCallVolume, 0)
origCallVolume = 0
origCallVolume = -1
}
Log.d(LOG_TAG, "Call volume of stream ${am.mode} is ${am.getStreamVolume(am.mode)}")
am.mode = AudioManager.MODE_NORMAL

View File

@ -0,0 +1 @@
- Fixed restoring of volume to original level if default call volume is in use.