diff --git a/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt index 18c9de09..5a4e62e4 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt @@ -83,13 +83,9 @@ class AudioActivity : AppCompatActivity() { aec = binding.Aec val aecCv = Config.variable("module") - oldAec = aecCv.contains("webrtc_aec.so") + oldAec = aecCv.contains("webrtc_aecm.so") aec.isChecked = oldAec - extendedFilter = binding.ExtendedFilter - oldExtendedFilter = Config.variable("webrtc_aec_extended_filter")[0] == "yes" - extendedFilter.isChecked = oldExtendedFilter - } override fun onCreateOptionsMenu(menu: Menu): Boolean { @@ -163,31 +159,21 @@ class AudioActivity : AppCompatActivity() { } if (aec.isChecked != oldAec) { - Config.removeLine("module webrtc_aec.so") + Config.removeLine("module webrtc_aecm.so") if (aec.isChecked) { - Config.addModuleLine("module webrtc_aec.so") - if (Api.module_load("webrtc_aec.so") != 0) { + Config.addModuleLine("module webrtc_aecm.so") + if (Api.module_load("webrtc_aecm.so") != 0) { Utils.alertView(this, getString(R.string.error), getString(R.string.failed_to_load_module)) aec.isChecked = false return false } } else { - Api.module_unload("webrtc_aec.so") + Api.module_unload("webrtc_aecm.so") } save = true } - if (extendedFilter.isChecked != oldExtendedFilter) { - Config.removeVariable("webrtc_aec_extended_filter") - if (extendedFilter.isChecked) - Config.addLine("webrtc_aec_extended_filter yes") - else - Config.addLine("webrtc_aec_extended_filter no") - reload = true - save = true - } - if (save) Config.save() if (reload) Api.reload_config() @@ -232,10 +218,6 @@ class AudioActivity : AppCompatActivity() { Utils.alertView(this, getString(R.string.aec), getString(R.string.aec_help)) } - binding.ExtendedFilterTitle -> { - Utils.alertView(this, getString(R.string.aec_extended_filter), - getString(R.string.aec_extended_filter_help)) - } } } diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt index bd63e8d5..9127815b 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt @@ -18,7 +18,7 @@ object Config { config = config.replace("webrtc_aec.so", "webrtc_aecm.so") if (!config.contains(Regex("ausrc_format s16"))) { - config = "${config}ausrc_format s16\nauplay_format s16\nauenc_format s16\naudec_format s16\nmodule webrtc_aec.so\n" + config = "${config}ausrc_format s16\nauplay_format s16\nauenc_format s16\naudec_format s16\nmodule webrtc_aecm.so\n" } if (config.contains(Regex("#module_app[ ]+mwi.so"))) { diff --git a/app/src/main/res/layout/activity_audio.xml b/app/src/main/res/layout/activity_audio.xml index 97e21792..b0159b63 100644 --- a/app/src/main/res/layout/activity_audio.xml +++ b/app/src/main/res/layout/activity_audio.xml @@ -123,32 +123,6 @@ - - - - - - -