diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 212225d44..ac31a841b 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -124,6 +124,14 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); { [self setInteger: linphone_core_get_audio_port(lc) forKey:@"audio_port_preference"]; [self setInteger: linphone_core_get_video_port(lc) forKey:@"video_port_preference"]; + } + { + [self setInteger: linphone_core_get_upload_bandwidth(lc) forKey:@"upload_bandwidth_preference"]; + [self setInteger: linphone_core_get_download_bandwidth(lc) forKey:@"download_bandwidth_preference"]; + } + { + [self setFloat:linphone_core_get_playback_gain_db(lc) forKey:@"playback_gain_preference"]; + //[self setFloat: linphone_core_get_microphone_gain_db(lc) forKey:@"microphone_gain_preference"]; } { LCSipTransports tp; @@ -482,6 +490,18 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); int video_port_preference = [self integerForKey:@"video_port_preference"]; linphone_core_set_video_port(lc, video_port_preference); + int upload_bandwidth = [self integerForKey:@"upload_bandwidth_preference"]; + linphone_core_set_upload_bandwidth(lc, upload_bandwidth); + + int download_bandwidth = [self integerForKey:@"download_bandwidth_preference"]; + linphone_core_set_download_bandwidth(lc, download_bandwidth); + + float playback_gain = [self floatForKey:@"playback_gain_preference"]; + linphone_core_set_playback_gain_db(lc, playback_gain); + + //float microphone_gain = [self floatForKey:@"microphone_gain_preference"]; + //linphone_core_set_microphone_gain_db(lc, microphone_gain); + UIDevice* device = [UIDevice currentDevice]; bool backgroundSupported = false; if ([device respondsToSelector:@selector(isMultitaskingSupported)]) diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index 0f9f21444..6906e3529 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -574,10 +574,18 @@ 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"]; + + [hiddenKeys addObject:@"network_limit_group"]; + [hiddenKeys addObject:@"upload_bandwidth_preference"]; + [hiddenKeys addObject:@"download_bandwidth_preference"]; + [hiddenKeys addObject:@"incoming_call_timeout_preference"]; [hiddenKeys addObject:@"in_call_timeout_preference"]; + [hiddenKeys addObject:@"quit_button"]; // Hide for the moment - [hiddenKeys addObject:@"about_button"]; // Hide for the moment if (!linphone_core_video_supported([LinphoneManager getLc])) [hiddenKeys addObject:@"video_menu"]; diff --git a/Resources/linphonerc b/Resources/linphonerc index b119f76f0..0b454af82 100644 --- a/Resources/linphonerc +++ b/Resources/linphonerc @@ -1,7 +1,5 @@ [sip] sip_random_port=1 -sip_tcp_random_port=1 -sip_tls_random_port=1 contact="Linphone iPhone" keepalive_period=30000 default_proxy=0 diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad index f31880409..adc25c51c 100644 --- a/Resources/linphonerc~ipad +++ b/Resources/linphonerc~ipad @@ -1,7 +1,5 @@ [sip] sip_random_port=1 -sip_tcp_random_port=1 -sip_tls_random_port=1 contact="Linphone iPhone" keepalive_period=30000 default_proxy=0 diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist index 46b19291c..ceb48e8c1 100644 --- a/Settings/InAppSettings.bundle/Audio.plist +++ b/Settings/InAppSettings.bundle/Audio.plist @@ -120,6 +120,50 @@ Type PSToggleSwitchSpecifier + + Key + audio_advanced_group + Title + Advanced + Type + PSGroupSpecifier + + + Key + playback_gain_preference + Title + Playback gain + Type + PSTextFieldSpecifier + AutocapitalizationType + None + AutocorrectionType + No + KeyboardType + NumberPad + DefaultValue + 0 + IASKTextAlignment + IASKUITextAlignmentRight + + + Key + microphone_gain_preference + Title + Microphone gain + Type + PSTextFieldSpecifier + AutocapitalizationType + None + AutocorrectionType + No + KeyboardType + NumberPad + DefaultValue + 0 + IASKTextAlignment + IASKUITextAlignmentRight + diff --git a/Settings/InAppSettings.bundle/Network.plist b/Settings/InAppSettings.bundle/Network.plist index 1bc2d7cf5..d5bed9345 100644 --- a/Settings/InAppSettings.bundle/Network.plist +++ b/Settings/InAppSettings.bundle/Network.plist @@ -158,6 +158,50 @@ DefaultValue + + Key + network_limit_group + Title + Limits + Type + PSGroupSpecifier + + + Key + upload_bandwidth_preference + Title + Upload bandwidth + Type + PSTextFieldSpecifier + AutocapitalizationType + None + AutocorrectionType + No + KeyboardType + NumberPad + DefaultValue + 0 + IASKTextAlignment + IASKUITextAlignmentRight + + + Key + download_bandwidth_preference + Title + Download bandwidth + Type + PSTextFieldSpecifier + AutocapitalizationType + None + AutocorrectionType + No + KeyboardType + NumberPad + DefaultValue + 0 + IASKTextAlignment + IASKUITextAlignmentRight + diff --git a/Settings/InAppSettings.bundle/en.lproj/Audio.strings b/Settings/InAppSettings.bundle/en.lproj/Audio.strings index c73fc3480..cf7f76b96 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Audio.strings @@ -34,3 +34,11 @@ /* PCMA */ "PCMA" = "PCMA"; +/* Advanced */ +"Advanced" = "Advanced"; + +/* Playback gain */ +"Playback gain" = "Playback gain"; + +/* Microphone gain */ +"Microphone gain" = "Microphone gain"; \ No newline at end of file diff --git a/Settings/InAppSettings.bundle/en.lproj/Network.strings b/Settings/InAppSettings.bundle/en.lproj/Network.strings index 299b28fbd..0af66238b 100644 --- a/Settings/InAppSettings.bundle/en.lproj/Network.strings +++ b/Settings/InAppSettings.bundle/en.lproj/Network.strings @@ -49,3 +49,11 @@ /* ZRTP */ "ZRTP" = "ZRTP"; +/* Limits */ +"Limits" = "Limits"; + +/* Upload bandwidth */ +"Upload bandwidth" = "Upload bandwidth"; + +/* Download bandwidth */ +"Download bandwidth" = "Download bandwidth"; diff --git a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings index c73fc3480..a86837e4a 100644 --- a/Settings/InAppSettings.bundle/fr.lproj/Audio.strings +++ b/Settings/InAppSettings.bundle/fr.lproj/Audio.strings @@ -34,3 +34,11 @@ /* PCMA */ "PCMA" = "PCMA"; +/* Advanced */ +"Advanced" = "Avancés"; + +/* Playback gain */ +"Playback gain" = "Gain sortie"; + +/* Microphone gain */ +"Microphone gain" = "Gain microphone"; \ No newline at end of file diff --git a/Settings/InAppSettings.bundle/fr.lproj/Network.strings b/Settings/InAppSettings.bundle/fr.lproj/Network.strings index 8382a9033..8235ab319 100644 --- a/Settings/InAppSettings.bundle/fr.lproj/Network.strings +++ b/Settings/InAppSettings.bundle/fr.lproj/Network.strings @@ -23,7 +23,7 @@ "Transport" = "Transport"; /* Media Encryption */ -"Media Encryption" = "Encryption media"; +"Media Encryption" = "Chiffrement"; /* Push Notifications */ "Push Notification" = "Push Notification"; @@ -49,3 +49,11 @@ /* ZRTP */ "ZRTP" = "ZRTP"; +/* Limits */ +"Limits" = "Limites"; + +/* Upload bandwidth */ +"Upload bandwidth" = "Débit montant"; + +/* Download bandwidth */ +"Download bandwidth" = "Débit descendant"; diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index c3d6021f3..6307ec04b 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -16518,7 +16518,7 @@ Raison: %2$s change date - 2012-10-01T10:31:40Z + 2012-11-06T09:45:46Z changed values class @@ -16528,7 +16528,7 @@ Raison: %2$s flags 0 hash - d07bfbef0b1c424572d4ab830553e0d6 + d8b4f45bf8fca397a7f791bd55a61e1c name Audio.strings @@ -16812,6 +16812,81 @@ Raison: %2$s snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Advanced + errors + + flags + 0 + key + Advanced + localizations + + en + Advanced + fr + Avancés + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Playback gain + errors + + flags + 0 + key + Playback gain + localizations + + en + Playback gain + fr + Gain sortie + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Microphone gain + errors + + flags + 0 + key + Microphone gain + localizations + + en + Microphone gain + fr + Gain microphone + + snapshots + + old objects @@ -17377,7 +17452,7 @@ Raison: %2$s change date - 2012-09-18T15:13:17Z + 2012-11-06T09:36:36Z changed values class @@ -17387,7 +17462,7 @@ Raison: %2$s flags 0 hash - f5919fdebddf11e613578ee7ff05f05e + bb988b6e05b6fdd4c767f75b9d73b087 name Network.strings @@ -17783,6 +17858,81 @@ Raison: %2$s snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Limits + errors + + flags + 0 + key + Limits + localizations + + en + Limits + fr + Limites + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Upload bandwidth + errors + + flags + 0 + key + Upload bandwidth + localizations + + en + Upload bandwidth + fr + Débit montant + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + Download bandwidth + errors + + flags + 0 + key + Download bandwidth + localizations + + en + Download bandwidth + fr + Débit descendant + + 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 c73fc3480..cf7f76b96 100644 --- a/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings +++ b/linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings @@ -34,3 +34,11 @@ /* PCMA */ "PCMA" = "PCMA"; +/* Advanced */ +"Advanced" = "Advanced"; + +/* Playback gain */ +"Playback gain" = "Playback gain"; + +/* Microphone gain */ +"Microphone gain" = "Microphone gain"; \ No newline at end of file diff --git a/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings b/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings index 299b28fbd..0af66238b 100644 --- a/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings +++ b/linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings @@ -49,3 +49,11 @@ /* ZRTP */ "ZRTP" = "ZRTP"; +/* Limits */ +"Limits" = "Limits"; + +/* Upload bandwidth */ +"Upload bandwidth" = "Upload bandwidth"; + +/* Download bandwidth */ +"Download bandwidth" = "Download bandwidth";