diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/apps/settings.c b/apps/settings.c index cbd39335f1..1316969726 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -94,7 +94,7 @@ const char rec_base_directory[] = REC_BASE_DIR; | |||
94 | #include "dsp.h" | 94 | #include "dsp.h" |
95 | #endif | 95 | #endif |
96 | 96 | ||
97 | #define CONFIG_BLOCK_VERSION 39 | 97 | #define CONFIG_BLOCK_VERSION 40 |
98 | #define CONFIG_BLOCK_SIZE 512 | 98 | #define CONFIG_BLOCK_SIZE 512 |
99 | #define RTC_BLOCK_SIZE 44 | 99 | #define RTC_BLOCK_SIZE 44 |
100 | 100 | ||
@@ -488,6 +488,10 @@ static const struct bit_entry hd_bits[] = | |||
488 | {4, S_O(crossfade_fade_out_duration), 0, "crossfade fade out duration", NULL}, | 488 | {4, S_O(crossfade_fade_out_duration), 0, "crossfade fade out duration", NULL}, |
489 | {1, S_O(crossfade_fade_out_mixmode), 0, "crossfade fade out mode", "crossfade,mix"}, | 489 | {1, S_O(crossfade_fade_out_mixmode), 0, "crossfade fade out mode", "crossfade,mix"}, |
490 | {1, S_O(crossfeed), false, "crossfeed", off_on }, | 490 | {1, S_O(crossfeed), false, "crossfeed", off_on }, |
491 | {6, S_O(crossfeed_direct_gain), 15, "crossfeed direct gain", NULL }, | ||
492 | {7, S_O(crossfeed_cross_gain), 60, "crossfeed cross gain", NULL }, | ||
493 | {8, S_O(crossfeed_hf_attenuation), 160, "crossfeed hf attenuation", NULL }, | ||
494 | {11, S_O(crossfeed_hf_cutoff), 700, "crossfeed hf cutoff", NULL }, | ||
491 | #endif | 495 | #endif |
492 | #ifdef HAVE_DIRCACHE | 496 | #ifdef HAVE_DIRCACHE |
493 | {1, S_O(dircache), false, "dircache", off_on }, | 497 | {1, S_O(dircache), false, "dircache", off_on }, |
@@ -538,6 +542,7 @@ static const struct bit_entry hd_bits[] = | |||
538 | "warn when erasing dynamic playlist", off_on }, | 542 | "warn when erasing dynamic playlist", off_on }, |
539 | #if CONFIG_CODEC == SWCODEC | 543 | #if CONFIG_CODEC == SWCODEC |
540 | {1, S_O(eq_enabled), false, "eq enabled", off_on }, | 544 | {1, S_O(eq_enabled), false, "eq enabled", off_on }, |
545 | {8, S_O(eq_precut), 0, "eq precut", NULL }, | ||
541 | /* 0..32768 Hz */ | 546 | /* 0..32768 Hz */ |
542 | {15, S_O(eq_band0_cutoff), 60, "eq band 0 cutoff", NULL }, | 547 | {15, S_O(eq_band0_cutoff), 60, "eq band 0 cutoff", NULL }, |
543 | {15, S_O(eq_band1_cutoff), 200, "eq band 1 cutoff", NULL }, | 548 | {15, S_O(eq_band1_cutoff), 200, "eq band 1 cutoff", NULL }, |
@@ -579,10 +584,6 @@ static const struct bit_entry hd_bits[] = | |||
579 | {1, S_O(tagcache_ram), 0, "tagcache_ram", off_on }, | 584 | {1, S_O(tagcache_ram), 0, "tagcache_ram", off_on }, |
580 | #endif | 585 | #endif |
581 | 586 | ||
582 | #if (CONFIG_CODEC == SWCODEC) | ||
583 | {8, S_O(eq_precut), 0, "eq precut", NULL }, | ||
584 | #endif | ||
585 | |||
586 | /* If values are just added to the end, no need to bump the version. */ | 587 | /* If values are just added to the end, no need to bump the version. */ |
587 | /* new stuff to be added at the end */ | 588 | /* new stuff to be added at the end */ |
588 | 589 | ||
@@ -1159,6 +1160,11 @@ void settings_apply(void) | |||
1159 | audio_set_crossfade(global_settings.crossfade); | 1160 | audio_set_crossfade(global_settings.crossfade); |
1160 | dsp_set_replaygain(true); | 1161 | dsp_set_replaygain(true); |
1161 | dsp_set_crossfeed(global_settings.crossfeed); | 1162 | dsp_set_crossfeed(global_settings.crossfeed); |
1163 | dsp_set_crossfeed_direct_gain(global_settings.crossfeed_direct_gain); | ||
1164 | dsp_set_crossfeed_cross_params(global_settings.crossfeed_cross_gain, | ||
1165 | global_settings.crossfeed_cross_gain | ||
1166 | + global_settings.crossfeed_hf_attenuation, | ||
1167 | global_settings.crossfeed_hf_cutoff); | ||
1162 | 1168 | ||
1163 | dsp_set_eq(global_settings.eq_enabled); | 1169 | dsp_set_eq(global_settings.eq_enabled); |
1164 | dsp_set_eq_precut(global_settings.eq_precut); | 1170 | dsp_set_eq_precut(global_settings.eq_precut); |