- Fixed some bugs in codecs activity.

This commit is contained in:
Juha Heinanen
2020-05-19 10:00:54 +03:00
parent 45bfaab030
commit 9058b8c82b
@@ -35,19 +35,22 @@ class CodecsActivity : AppCompatActivity() {
acc = ua.account acc = ua.account
val codecs: ArrayList<String> val codecs: ArrayList<String>
val accCodecs: ArrayList<String>
val title = findViewById(R.id.CodecsTitle) as TextView val title = findViewById(R.id.CodecsTitle) as TextView
if (media == "audio") { if (media == "audio") {
title.text = getString(R.string.audio_codecs) title.text = getString(R.string.audio_codecs)
codecs = ArrayList(Api.audio_codecs().split(",")) codecs = ArrayList(Api.audio_codecs().split(","))
newCodecs.addAll(acc.audioCodec) accCodecs = acc.audioCodec
} else { } else {
title.text = getString(R.string.video_codecs) title.text = getString(R.string.video_codecs)
codecs = ArrayList(Api.video_codecs().split(",")) codecs = ArrayList(Api.video_codecs().split(",").distinct())
newCodecs.addAll(acc.videoCodec) accCodecs = acc.videoCodec
} }
newCodecs.addAll(accCodecs)
while (newCodecs.size < codecs.size) newCodecs.add("-") while (newCodecs.size < codecs.size) newCodecs.add("-")
val layout = findViewById(R.id.SpinnerTable) as TableLayout val layout = findViewById(R.id.SpinnerTable) as TableLayout
@@ -59,8 +62,8 @@ class CodecsActivity : AppCompatActivity() {
LayoutParams.WRAP_CONTENT) LayoutParams.WRAP_CONTENT)
spinner.layoutParams.height = 75 spinner.layoutParams.height = 75
layout.addView(spinner) layout.addView(spinner)
if (acc.audioCodec.size > i) { if (accCodecs.size > i) {
val codec = acc.audioCodec[i] val codec = accCodecs[i]
spinnerList[i].add(codec) spinnerList[i].add(codec)
spinnerList[i].add("-") spinnerList[i].add("-")
for (c in codecs) if (c != codec) spinnerList[i].add(c) for (c in codecs) if (c != codec) spinnerList[i].add(c)
@@ -121,7 +124,7 @@ class CodecsActivity : AppCompatActivity() {
if (mc != acc.videoCodec) { if (mc != acc.videoCodec) {
if (account_set_video_codecs(acc.accp, mcList) == 0) { if (account_set_video_codecs(acc.accp, mcList) == 0) {
Log.d("Baresip", "New video codecs '$mcList'") Log.d("Baresip", "New video codecs '$mcList'")
acc.audioCodec = mc acc.videoCodec = mc
save = true save = true
} else { } else {
Log.e("Baresip", "Setting of video codecs '$mcList' failed") Log.e("Baresip", "Setting of video codecs '$mcList' failed")