diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 3c82e864d..fa433395b 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -182,7 +182,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
{
[self transformCodecsToKeys: linphone_core_get_audio_codecs(lc)];
- [self transformCodecsToKeys: linphone_core_get_video_codecs(lc)];
+ [self transformCodecsToKeys: linphone_core_get_video_codecs(lc)];
+ [self setBool:linphone_core_adaptive_rate_control_enabled(lc) forKey:@"adaptive_rate_control_preference"];
}
{
@@ -492,6 +493,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
NSString *pref=[LinphoneManager getPreferenceForCodec:pt->mime_type withRate:pt->clock_rate];
linphone_core_enable_payload_type(lc,pt,[self boolForKey: pref]);
}
+
+ linphone_core_enable_adaptive_rate_control(lc, [self boolForKey:@"adaptive_rate_control_preference"]);
linphone_core_set_use_info_for_dtmf(lc, [self boolForKey:@"sipinfo_dtmf_preference"]);
linphone_core_set_use_rfc2833_for_dtmf(lc, [self boolForKey:@"rfc_dtmf_preference"]);
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index 8cb63f9c8..d0eb48067 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -586,7 +586,6 @@ static UICompositeViewDescription *compositeDescription = nil;
[hiddenKeys addObject:@"battery_alert_button"];
#endif
- [hiddenKeys addObject:@"audio_advanced_group"];
[hiddenKeys addObject:@"playback_gain_preference"];
[hiddenKeys addObject:@"microphone_gain_preference"];
diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist
index 5fa9900a1..a7d91efac 100644
--- a/Settings/InAppSettings.bundle/Audio.plist
+++ b/Settings/InAppSettings.bundle/Audio.plist
@@ -188,6 +188,16 @@
IASKTextAlignment
IASKUITextAlignmentRight
+
+ DefaultValue
+
+ Key
+ adaptive_rate_control_preference
+ Title
+ Adaptive rate control
+ Type
+ PSToggleSwitchSpecifier
+
diff --git a/Settings/InAppSettings.bundle/en.lproj/Audio.strings b/Settings/InAppSettings.bundle/en.lproj/Audio.strings
index cf7f76b96..313420848 100644
--- a/Settings/InAppSettings.bundle/en.lproj/Audio.strings
+++ b/Settings/InAppSettings.bundle/en.lproj/Audio.strings
@@ -41,4 +41,7 @@
"Playback gain" = "Playback gain";
/* Microphone gain */
-"Microphone gain" = "Microphone gain";
\ No newline at end of file
+"Microphone gain" = "Microphone gain";
+
+/* Adaptive rate control */
+"Adaptive rate control" = "Adaptive rate control";
\ No newline at end of file
diff --git a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings
index a86837e4a..2b73797e4 100644
--- a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings
+++ b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings
@@ -41,4 +41,7 @@
"Playback gain" = "Gain sortie";
/* Microphone gain */
-"Microphone gain" = "Gain microphone";
\ No newline at end of file
+"Microphone gain" = "Gain microphone";
+
+/* Adaptive rate control */
+"Adaptive rate control" = "Contrôle de débit";
\ No newline at end of file
diff --git a/Settings/InAppSettings.bundle/ru.lproj/Audio.strings b/Settings/InAppSettings.bundle/ru.lproj/Audio.strings
index d1aeb96f3..2bd5ee497 100644
--- a/Settings/InAppSettings.bundle/ru.lproj/Audio.strings
+++ b/Settings/InAppSettings.bundle/ru.lproj/Audio.strings
@@ -41,4 +41,7 @@
"Playback gain" = "Усиление воспроизведения";
/* Microphone gain */
-"Microphone gain" = "Усиление микрофона";
\ No newline at end of file
+"Microphone gain" = "Усиление микрофона";
+
+/* Adaptive rate control */
+"Adaptive rate control" = "Adaptive rate control";
\ No newline at end of file
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index 170d97bda..9e3fd2fd2 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -17902,7 +17902,7 @@ Raison: %2$s
change date
- 2012-11-06T09:45:46Z
+ 2013-06-26T10:38:34Z
changed values
class
@@ -17912,7 +17912,7 @@ Raison: %2$s
flags
0
hash
- d8b4f45bf8fca397a7f791bd55a61e1c
+ 3d30b341d7d52a2764e5683a2ca348c1
name
Audio.strings
@@ -18279,6 +18279,31 @@ Raison: %2$s
snapshots
+
+ change date
+ 2001-01-01T00:00:00Z
+ changed values
+
+ class
+ BLStringKeyObject
+ comment
+ Adaptive rate control
+ errors
+
+ flags
+ 0
+ key
+ Adaptive rate control
+ localizations
+
+ en
+ Adaptive rate control
+ fr
+ Contrôle de débit
+
+ snapshots
+
+
old objects
diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings b/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
index cf7f76b96..313420848 100644
--- a/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
+++ b/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
@@ -41,4 +41,7 @@
"Playback gain" = "Playback gain";
/* Microphone gain */
-"Microphone gain" = "Microphone gain";
\ No newline at end of file
+"Microphone gain" = "Microphone gain";
+
+/* Adaptive rate control */
+"Adaptive rate control" = "Adaptive rate control";
\ No newline at end of file