- Fixed restoring of volume to original level if default call volume is in use.
This commit is contained in:
+2
-2
@@ -8,8 +8,8 @@ android {
|
|||||||
applicationId = 'com.tutpro.baresip'
|
applicationId = 'com.tutpro.baresip'
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
versionCode = 62
|
versionCode = 63
|
||||||
versionName = '8.0.0'
|
versionName = '8.0.1'
|
||||||
externalNativeBuild {
|
externalNativeBuild {
|
||||||
cmake {
|
cmake {
|
||||||
cFlags '-DHAVE_INTTYPES_H'
|
cFlags '-DHAVE_INTTYPES_H'
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class BaresipService: Service() {
|
|||||||
internal var rtTimer: Timer? = null
|
internal var rtTimer: Timer? = null
|
||||||
internal var audioFocusRequest: AudioFocusRequest? = null
|
internal var audioFocusRequest: AudioFocusRequest? = null
|
||||||
internal var audioFocused = false
|
internal var audioFocused = false
|
||||||
internal var origCallVolume = 0
|
internal var origCallVolume = -1
|
||||||
|
|
||||||
override fun onCreate() {
|
override fun onCreate() {
|
||||||
|
|
||||||
@@ -393,7 +393,7 @@ class BaresipService: Service() {
|
|||||||
requestAudioFocus(AudioManager.STREAM_VOICE_CALL)
|
requestAudioFocus(AudioManager.STREAM_VOICE_CALL)
|
||||||
}
|
}
|
||||||
if (callVolume != 0) {
|
if (callVolume != 0) {
|
||||||
origCallVolume = am.getStreamMaxVolume(am.mode)
|
origCallVolume = am.getStreamVolume(am.mode)
|
||||||
am.setStreamVolume(am.mode,
|
am.setStreamVolume(am.mode,
|
||||||
(callVolume * 0.1 * am.getStreamMaxVolume(am.mode)).roundToInt(),
|
(callVolume * 0.1 * am.getStreamMaxVolume(am.mode)).roundToInt(),
|
||||||
0)
|
0)
|
||||||
@@ -480,9 +480,9 @@ class BaresipService: Service() {
|
|||||||
}
|
}
|
||||||
if (Call.calls().size == 0) {
|
if (Call.calls().size == 0) {
|
||||||
abandonAudioFocus()
|
abandonAudioFocus()
|
||||||
if (origCallVolume != 0) {
|
if (origCallVolume != -1) {
|
||||||
am.setStreamVolume(am.mode, origCallVolume, 0)
|
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)}")
|
Log.d(LOG_TAG, "Call volume of stream ${am.mode} is ${am.getStreamVolume(am.mode)}")
|
||||||
am.mode = AudioManager.MODE_NORMAL
|
am.mode = AudioManager.MODE_NORMAL
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
- Fixed restoring of volume to original level if default call volume is in use.
|
||||||
Reference in New Issue
Block a user