From a8d884a149aaf891f5984ff7ff583927bcb14042 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Mon, 1 Oct 2012 13:49:11 +0200 Subject: [PATCH] Fix audio settings --- Classes/LinphoneManager.m | 3 +- Settings/InAppSettings.bundle/Audio.plist | 22 +++++++- .../en.lproj/Audio.strings | 6 ++ .../fr.lproj/Audio.strings | Bin 66 -> 423 bytes linphone.ldb/Contents.plist | 52 +++++++++++++++++- .../Audio/1/Audio.strings | 6 ++ 6 files changed, 84 insertions(+), 5 deletions(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 80a8e4eb6..e414b540f 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -102,7 +102,8 @@ struct codec_name_pref_table codec_pref_table[]={ { "speex", 16000, @"speex_16k_preference" }, { "silk", 24000, @"silk_24k_preference" }, { "silk", 16000, @"silk_16k_preference" }, - { "amr", 8000, @"amr_8k_preference" }, + { "amr", 8000, @"amr_preference" }, + { "gsm", 8000, @"gsm_preference" }, { "ilbc", 8000, @"ilbc_preference"}, { "pcmu", 8000, @"pcmu_preference"}, { "pcma", 8000, @"pcma_preference"}, diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist index d51abaff1..46b19291c 100644 --- a/Settings/InAppSettings.bundle/Audio.plist +++ b/Settings/InAppSettings.bundle/Audio.plist @@ -50,6 +50,16 @@ Type PSToggleSwitchSpecifier + + DefaultValue + + Key + amr_preference + Title + AMR + Type + PSToggleSwitchSpecifier + DefaultValue @@ -64,7 +74,17 @@ DefaultValue Key - gsm_8k_preference + g729_preference + Title + G729 + Type + PSToggleSwitchSpecifier + + + DefaultValue + + Key + gsm_preference Title GSM Type diff --git a/Settings/InAppSettings.bundle/en.lproj/Audio.strings b/Settings/InAppSettings.bundle/en.lproj/Audio.strings index 9ac131e7f..c73fc3480 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Audio.strings @@ -1,6 +1,9 @@ /* Codecs */ "Codecs" = "Codecs"; +/* AMR */ +"AMR" = "AMR"; + /* Speex 16Khz */ "Speex 16Khz" = "Speex 16Khz"; @@ -16,6 +19,9 @@ /* G722 */ "G722" = "G722"; +/* G729 */ +"G729" = "G729"; + /* GSM */ "GSM" = "GSM"; diff --git a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings index 975efd03a087939b9697dbb2aae2a740ec6defa3..c73fc34809fdfe02d29d08223fec5c6a9f96e528 100644 GIT binary patch literal 423 zcmY+9F$w}P5Jmf(V%RcGa1k|#MNF}X2E^bAG@z`YU?ZO1oj;pwtmc2-n=mn&{PUVF zZ_-9J5*yl3j%%fiCKpcN!vy3hB)(Gm&}^~4ePL7`X5H(J)&Bz5%10gb`=h6JUi4B$ zpK7I7=P*Z|bg80u%eKYc9H1Z+Xfw1K+VSIE48md%G)!6B9kw2b0~mt9qYr054uA*+ Lx(r>0j-UMjy0l>` literal 66 rcmezWkBdPc2o)Hd8S)uY7*ZLM8HyRW7?e=>N change date - 2012-09-11T10:05:26Z + 2012-10-01T10:31:40Z changed values class @@ -16217,9 +16217,9 @@ Raison: %2$s errors flags - 1 + 0 hash - e3ec0c0a4b3e250fec1852916b6b69ac + d07bfbef0b1c424572d4ab830553e0d6 name Audio.strings @@ -16250,6 +16250,29 @@ Raison: %2$s snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + AMR + errors + + flags + 2 + key + AMR + localizations + + en + AMR + + snapshots + + change date 2001-01-01T00:00:00Z @@ -16365,6 +16388,29 @@ Raison: %2$s snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + G729 + errors + + flags + 2 + key + G729 + localizations + + en + G729 + + snapshots + + change date 2001-01-01T00:00:00Z diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings b/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings index 9ac131e7f..c73fc3480 100644 --- a/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings +++ b/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings @@ -1,6 +1,9 @@ /* Codecs */ "Codecs" = "Codecs"; +/* AMR */ +"AMR" = "AMR"; + /* Speex 16Khz */ "Speex 16Khz" = "Speex 16Khz"; @@ -16,6 +19,9 @@ /* G722 */ "G722" = "G722"; +/* G729 */ +"G729" = "G729"; + /* GSM */ "GSM" = "GSM";