devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Consolidate compressor settings into a struct.

Browse source 
Doing that makes things cleaner for later on.

Change-Id: I4e279aa57ace16a348acc0fc09059592325ec95f
This commit is contained in:
Michael Sevakis 2012-04-26 17:19:16 -04:00
parent 97a535d83c
commit 0842d7f7e1
8 changed files with 222 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/menus/sound_menu.c
View file

@ -126,15 +126,20 @@ static int timestretch_callback(int action,const struct menu_item_ex *this_item)
/* compressor submenu */
MENUITEM_SETTING(compressor_threshold,
&global_settings.compressor_threshold, lowlatency_callback);
&global_settings.compressor_settings.threshold,
lowlatency_callback);
MENUITEM_SETTING(compressor_gain,
&global_settings.compressor_makeup_gain, lowlatency_callback);
&global_settings.compressor_settings.makeup_gain,
lowlatency_callback);
MENUITEM_SETTING(compressor_ratio,
&global_settings.compressor_ratio, lowlatency_callback);
&global_settings.compressor_settings.ratio,
lowlatency_callback);
MENUITEM_SETTING(compressor_knee,
&global_settings.compressor_knee, lowlatency_callback);
&global_settings.compressor_settings.knee,
lowlatency_callback);
MENUITEM_SETTING(compressor_release,
&global_settings.compressor_release_time, lowlatency_callback);
&global_settings.compressor_settings.release_time,
lowlatency_callback);
MAKE_MENU(compressor_menu,ID2P(LANG_COMPRESSOR), NULL, Icon_NOICON,
&compressor_threshold, &compressor_gain, &compressor_ratio,
&compressor_knee, &compressor_release);

7
apps/settings.c
View file

@ -780,9 +780,6 @@ void settings_apply(bool read_disk)
{
#ifdef HAVE_LCD_BITMAP
int rc;
#endif
#if CONFIG_CODEC == SWCODEC
int i;
#endif
sound_settings_apply();
@ -991,7 +988,7 @@ void settings_apply(bool read_disk)
/* Configure software equalizer, hardware eq is handled in audio_init() */
dsp_set_eq(global_settings.eq_enabled);
dsp_set_eq_precut(global_settings.eq_precut);
for(i = 0; i < 5; i++) {
for(int i = 0; i < 5; i++) {
dsp_set_eq_coefs(i);
}
@ -999,7 +996,7 @@ void settings_apply(bool read_disk)
#ifdef HAVE_PITCHSCREEN
dsp_timestretch_enable(global_settings.timestretch_enabled);
#endif
dsp_set_compressor();
dsp_set_compressor(&global_settings.compressor_settings);
#endif
#ifdef HAVE_SPDIF_POWER

13
apps/settings.h
View file

@ -772,11 +772,14 @@ struct user_settings
#endif
#if CONFIG_CODEC == SWCODEC
int compressor_threshold;
int compressor_makeup_gain;
int compressor_ratio;
int compressor_knee;
int compressor_release_time;
struct compressor_settings
{
int threshold;
int makeup_gain;
int ratio;
int knee;
int release_time;
} compressor_settings;
#endif
int sleeptimer_duration; /* In minutes; 0=off */

15
apps/settings_list.c
View file

@ -436,7 +436,7 @@ static void crossfeed_cross_set(int val)
static void compressor_set(int val)
{
(void)val;
dsp_set_compressor();
dsp_set_compressor(&global_settings.compressor_settings);
}
static const char* db_format(char* buffer, size_t buffer_size, int value,
@ -1482,25 +1482,26 @@ const struct settings_list settings[] = {
#endif
/* compressor */
INT_SETTING_NOWRAP(F_SOUNDSETTING, compressor_threshold,
INT_SETTING_NOWRAP(F_SOUNDSETTING, compressor_settings.threshold,
LANG_COMPRESSOR_THRESHOLD, 0,
"compressor threshold", UNIT_DB, 0, -24,
-3, formatter_unit_0_is_off, getlang_unit_0_is_off, compressor_set),
CHOICE_SETTING(F_SOUNDSETTING|F_NO_WRAP, compressor_makeup_gain,
-3, formatter_unit_0_is_off, getlang_unit_0_is_off,
compressor_set),
CHOICE_SETTING(F_SOUNDSETTING|F_NO_WRAP, compressor_settings.makeup_gain,
LANG_COMPRESSOR_GAIN, 1, "compressor makeup gain",
"off,auto", compressor_set, 2,
ID2P(LANG_OFF), ID2P(LANG_AUTO)),
CHOICE_SETTING(F_SOUNDSETTING|F_NO_WRAP, compressor_ratio,
CHOICE_SETTING(F_SOUNDSETTING|F_NO_WRAP, compressor_settings.ratio,
LANG_COMPRESSOR_RATIO, 1, "compressor ratio",
"2:1,4:1,6:1,10:1,limit", compressor_set, 5,
ID2P(LANG_COMPRESSOR_RATIO_2), ID2P(LANG_COMPRESSOR_RATIO_4),
ID2P(LANG_COMPRESSOR_RATIO_6), ID2P(LANG_COMPRESSOR_RATIO_10),
ID2P(LANG_COMPRESSOR_RATIO_LIMIT)),
CHOICE_SETTING(F_SOUNDSETTING|F_NO_WRAP, compressor_knee,
CHOICE_SETTING(F_SOUNDSETTING|F_NO_WRAP, compressor_settings.knee,
LANG_COMPRESSOR_KNEE, 1, "compressor knee",
"hard knee,soft knee", compressor_set, 2,
ID2P(LANG_COMPRESSOR_HARD_KNEE), ID2P(LANG_COMPRESSOR_SOFT_KNEE)),
INT_SETTING_NOWRAP(F_SOUNDSETTING, compressor_release_time,
INT_SETTING_NOWRAP(F_SOUNDSETTING, compressor_settings.release_time,
LANG_COMPRESSOR_RELEASE, 500,
"compressor release time", UNIT_MS, 100, 1000,
100, NULL, NULL, compressor_set),