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

Audio modules need to be placed in config file before tmp and application modules.

Browse Source
This commit is contained in:
Juha Heinanen
2020-07-14 15:02:51 +03:00
parent 14b91f0b8e
commit ff65e6f6cd
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
View File

@ -33,6 +33,7 @@ class AudioActivity : AppCompatActivity() {
setContentView(R.layout.activity_audio)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
Utils.addActivity("audio")
val audioModulesList = findViewById(R.id.AudioModulesList) as LinearLayout
var id = 1000
@ -87,8 +88,6 @@ class AudioActivity : AppCompatActivity() {
oldExtendedFilter = Config.variable("webrtc_aec_extended_filter")[0] == "yes"
extentedFilter.isChecked = oldExtendedFilter
Utils.addActivity("audio")
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@ -118,7 +117,7 @@ class AudioActivity : AppCompatActivity() {
"${getString(R.string.failed_to_load_module)}: $module.so")
return false
}
Config.addLine("module $module.so")
Config.addModuleLine("module $module.so")
save = true
}
if (!box.isChecked && oldAudioModules[module]!!) {
@ -164,7 +163,7 @@ class AudioActivity : AppCompatActivity() {
if (aec.isChecked != oldAec) {
Config.removeLine("module webrtc_aec.so")
if (aec.isChecked) {
Config.addLine("module webrtc_aec.so")
Config.addModuleLine("module webrtc_aec.so")
if (Api.module_load("webrtc_aec.so") != 0) {
Utils.alertView(this, getString(R.string.error),
getString(R.string.failed_to_load_module))

5
app/src/main/kotlin/com/tutpro/baresip/Config.kt
View File

@ -109,6 +109,11 @@ object Config {
config = Utils.removeLinesStartingWithString(config, line)
}
fun addModuleLine(line: String) {
// Make sure it goes before first 'module_tmp'
config = config.replace("module opensles.so", "$line\nmodule opensles.so")
}
fun removeVariable(variable: String) {
config = Utils.removeLinesStartingWithString(config, "$variable ")
}