diff options
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index ae811bad4e..6594db7aa3 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -262,23 +262,12 @@ static void crossfeed_format(char* buffer, int buffer_size, int value, | |||
262 | snprintf(buffer, buffer_size, "%s%d.%d %s", value == 0 ? " " : "-", | 262 | snprintf(buffer, buffer_size, "%s%d.%d %s", value == 0 ? " " : "-", |
263 | value / 10, value % 10, unit); | 263 | value / 10, value % 10, unit); |
264 | } | 264 | } |
265 | static void crossfeed_cross_gain_helper(int val) | 265 | static void crossfeed_cross_set(int val) |
266 | { | 266 | { |
267 | dsp_set_crossfeed_cross_params(val, | 267 | (void)val; |
268 | val + global_settings.crossfeed_hf_attenuation, | 268 | dsp_set_crossfeed_cross_params(global_settings.crossfeed_cross_gain, |
269 | global_settings.crossfeed_hf_cutoff); | 269 | global_settings.crossfeed_hf_attenuation, |
270 | } | 270 | global_settings.crossfeed_hf_cutoff); |
271 | static void crossfeed_hf_att_helper(int val) | ||
272 | { | ||
273 | dsp_set_crossfeed_cross_params(global_settings.crossfeed_cross_gain, | ||
274 | global_settings.crossfeed_cross_gain + val, | ||
275 | global_settings.crossfeed_hf_cutoff); | ||
276 | } | ||
277 | static void crossfeed_hf_cutoff_helper(int val) | ||
278 | { | ||
279 | dsp_set_crossfeed_cross_params(global_settings.crossfeed_cross_gain, | ||
280 | global_settings.crossfeed_cross_gain | ||
281 | + global_settings.crossfeed_hf_attenuation, val); | ||
282 | } | 271 | } |
283 | 272 | ||
284 | static void replaygain_preamp_format(char* buffer, int buffer_size, int value, | 273 | static void replaygain_preamp_format(char* buffer, int buffer_size, int value, |
@@ -828,7 +817,7 @@ const struct settings_list settings[] = { | |||
828 | INT_SETTING(0, crossfade_fade_out_duration, LANG_CROSSFADE_FADE_OUT_DURATION, 0, | 817 | INT_SETTING(0, crossfade_fade_out_duration, LANG_CROSSFADE_FADE_OUT_DURATION, 0, |
829 | "crossfade fade out duration", UNIT_SEC, 0, 15, 1, NULL, NULL, NULL), | 818 | "crossfade fade out duration", UNIT_SEC, 0, 15, 1, NULL, NULL, NULL), |
830 | CHOICE_SETTING(0, crossfade_fade_out_mixmode, LANG_CROSSFADE_FADE_OUT_MODE, | 819 | CHOICE_SETTING(0, crossfade_fade_out_mixmode, LANG_CROSSFADE_FADE_OUT_MODE, |
831 | 0, "crossfade fade out mode", "crossfade,mix" ,NULL, 2, | 820 | 0, "crossfade fade out mode", "crossfade,mix", NULL, 2, |
832 | ID2P(LANG_CROSSFADE), ID2P(LANG_MIX)), | 821 | ID2P(LANG_CROSSFADE), ID2P(LANG_MIX)), |
833 | 822 | ||
834 | /* crossfeed */ | 823 | /* crossfeed */ |
@@ -839,13 +828,13 @@ const struct settings_list settings[] = { | |||
839 | crossfeed_format, NULL, dsp_set_crossfeed_direct_gain), | 828 | crossfeed_format, NULL, dsp_set_crossfeed_direct_gain), |
840 | INT_SETTING(0, crossfeed_cross_gain, LANG_CROSSFEED_CROSS_GAIN, 60, | 829 | INT_SETTING(0, crossfeed_cross_gain, LANG_CROSSFEED_CROSS_GAIN, 60, |
841 | "crossfeed cross gain", UNIT_DB, 30, 120, 5, | 830 | "crossfeed cross gain", UNIT_DB, 30, 120, 5, |
842 | crossfeed_format, NULL, crossfeed_cross_gain_helper), | 831 | crossfeed_format, NULL, crossfeed_cross_set), |
843 | INT_SETTING(0, crossfeed_hf_attenuation, LANG_CROSSFEED_HF_ATTENUATION, 160, | 832 | INT_SETTING(0, crossfeed_hf_attenuation, LANG_CROSSFEED_HF_ATTENUATION, 160, |
844 | "crossfeed hf attenuation", UNIT_DB, 60, 240, 5, | 833 | "crossfeed hf attenuation", UNIT_DB, 60, 240, 5, |
845 | crossfeed_format, NULL, crossfeed_hf_att_helper), | 834 | crossfeed_format, NULL, crossfeed_cross_set), |
846 | INT_SETTING(0, crossfeed_hf_cutoff, LANG_CROSSFEED_HF_CUTOFF,700, | 835 | INT_SETTING(0, crossfeed_hf_cutoff, LANG_CROSSFEED_HF_CUTOFF, 700, |
847 | "crossfeed hf cutoff", UNIT_HERTZ, 500, 2000, 100, | 836 | "crossfeed hf cutoff", UNIT_HERTZ, 500, 2000, 100, |
848 | NULL, NULL, crossfeed_hf_cutoff_helper), | 837 | NULL, NULL, crossfeed_cross_set), |
849 | /* equalizer */ | 838 | /* equalizer */ |
850 | OFFON_SETTING(0,eq_enabled,LANG_EQUALIZER_ENABLED,false,"eq enabled",NULL), | 839 | OFFON_SETTING(0,eq_enabled,LANG_EQUALIZER_ENABLED,false,"eq enabled",NULL), |
851 | INT_SETTING(0, eq_precut, LANG_EQUALIZER_PRECUT, 0, "eq precut", | 840 | INT_SETTING(0, eq_precut, LANG_EQUALIZER_PRECUT, 0, "eq precut", |