Add bass-boost and voice processing activation switches in the settings

This commit is contained in:
Guillaume BIENKOWSKI 2014-09-19 10:10:39 +02:00
parent e4d66021cf
commit 8f2a736bb0
10 changed files with 63 additions and 13 deletions

View file

@ -187,8 +187,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self setBool:linphone_core_adaptive_rate_control_enabled(lc) forKey:@"adaptive_rate_control_preference"];
[self setString:linphone_core_get_adaptive_rate_algorithm(lc) forKey:@"adaptive_rate_algorithm_preference"];
[self setInteger:lp_config_get_int(conf, "audio", "codec_bitrate_limit", kLinphoneAudioVbrCodecDefaultBitrate) forKey:@"audio_codec_bitrate_limit_preference"];
[self setInteger:lp_config_get_int(conf, LINPHONERC_APPLICATION_KEY, "disable_voiceproc", 0) forKey:@"disable_voiceproc"];
[self setInteger:lp_config_get_int(conf, "audio", "codec_bitrate_limit", kLinphoneAudioVbrCodecDefaultBitrate) forKey:@"audio_codec_bitrate_limit_preference"];
[self setInteger:lp_config_get_int(conf, LINPHONERC_APPLICATION_KEY, "voiceproc_preference", 1) forKey:@"voiceproc_preference"];
[self setInteger:lp_config_get_int(conf, "sound", "eq_active", 0) forKey:@"eq_active"];
}
[self setBool:lp_config_get_int(conf, LINPHONERC_APPLICATION_KEY, "advanced_account_preference", 0) forKey:@"advanced_account_preference"];
@ -543,7 +544,16 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
[self stringForKey:@"adaptive_rate_algorithm_preference"] cStringUsingEncoding:[NSString defaultCStringEncoding]
]);
lp_config_set_int(config, LINPHONERC_APPLICATION_KEY, "disable_voiceproc", [self boolForKey:@"disable_voiceproc"]);
// Voice processing
BOOL voice_processing = [self boolForKey:@"voiceproc_preference"];
lp_config_set_int(config, LINPHONERC_APPLICATION_KEY, "voiceproc_preference", voice_processing);
NSString* au_device = @"AU: Audio Unit Receiver";
if( !voice_processing ){ au_device = @"AU: Audio Unit NoVoiceProc"; }
linphone_core_set_capture_device(lc, [au_device UTF8String]);
linphone_core_set_playback_device(lc, [au_device UTF8String]);
BOOL equalizer = [self boolForKey:@"eq_active"];
lp_config_set_int(config, "sound", "eq_active", equalizer);
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"]);

View file

@ -23,6 +23,11 @@ firewall_policy=0
download_bw=380
upload_bw=380
[sound]
playback_dev_id=AU: Audio Unit Receiver
capture_dev_id=AU: Audio Unit Receiver
eq_active=0
[app]
rotation_preference=auto
animations_preference=1
@ -31,7 +36,7 @@ use_system_contacts=0
start_at_boot_preference=1
backgroundmode_preference=1
autoanswer_notif_preference=1
voiceproc_preference=1
[default_values]
reg_expires=600

View file

@ -26,12 +26,9 @@ video_jitt_comp=60
nortp_timeout=30
[sound]
playback_dev_id=AU: Audio Unit Receiver
ringer_dev_id=AQ: Audio Queue Device
capture_dev_id=AU: Audio Unit Receiver
echocancellation=0
dtmf_player_amp=0.007
eq_active=1
eq_location=mic
eq_gains=50:2:50 100:2:50

View file

@ -26,12 +26,9 @@ video_jitt_comp=60
nortp_timeout=30
[sound]
playback_dev_id=AU: Audio Unit Receiver
ringer_dev_id=AQ: Audio Queue Device
capture_dev_id=AU: Audio Unit Receiver
echocancellation=0
dtmf_player_amp=0.007
eq_active=1
eq_location=mic
eq_gains=50:2:50 100:2:50

View file

@ -23,6 +23,11 @@ firewall_policy=0
download_bw=512
upload_bw=512
[sound]
playback_dev_id=AU: Audio Unit Receiver
capture_dev_id=AU: Audio Unit Receiver
eq_active=0
[app]
rotation_preference=auto
animations_preference=1
@ -31,6 +36,7 @@ use_system_contacts=0
start_at_boot_preference=1
backgroundmode_preference=1
autoanswer_notif_preference=1
voiceproc_preference=1
[default_values]
reg_expires=600

View file

@ -246,13 +246,23 @@
<integer>128</integer>
</array>
</dict>
<dict>
<key>DefaultValue</key>
<true/>
<key>Key</key>
<string>voiceproc_preference</string>
<key>Title</key>
<string>Enable Voice Processing</string>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
</dict>
<dict>
<key>DefaultValue</key>
<false/>
<key>Key</key>
<string>disable_voiceproc</string>
<string>eq_active</string>
<key>Title</key>
<string>Disable VoiceProc and Equalizer</string>
<string>Enable Bass Boost</string>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
</dict>

View file

@ -48,3 +48,9 @@
/* Codec bitrate limit */
"Codec bitrate limit" = "Codec bitrate limit";
/* Voice processing */
"Enable Voice Processing"="Enable Voice Processing";
/* Bass Boost / equalizer */
"Enable Bass Boost"="Enable Bass Boost";

View file

@ -48,3 +48,16 @@
/* Codec bitrate limit */
"Codec bitrate limit" = "Limite de débit du codec";
/* Voice processing */
"Enable Voice Processing"="Optimiser le son pour la VoIP";
/* Bass Boost / equalizer */
"Enable Bass Boost"="Activer Bass Boost";
/* Adaptative */
"Adaptive rate algorithm"="Adaptation du débit";
"Simple"="Simple";
"Stateful"="Stateful";

View file

@ -48,3 +48,9 @@
/* Codec bitrate limit */
"Codec bitrate limit" = "Codec bitrate limit";
/* Voice processing */
"Enable Voice Processing"="Enable Voice Processing";
/* Bass Boost / equalizer */
"Enable Bass Boost"="Enable Bass Boost";

@ -1 +1 @@
Subproject commit df58cddb5d09bba69802ee33aee5385607fd1a68
Subproject commit ebdc286d6d9e9b6b90f0096f9932a6d25642a0a3