From ff65e6f6cdb59f5766c11d115f67483061adcbaf Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Tue, 14 Jul 2020 15:02:51 +0300
Subject: [PATCH] Audio modules need to be placed in config file before tmp and
 application modules.

---
 app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt | 7 +++----
 app/src/main/kotlin/com/tutpro/baresip/Config.kt        | 5 +++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
index e0d52cef..cf994b1b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
@@ -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))
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index 763a6a37..e8085759 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -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 ")
     }