len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

In the equalizer menu, switch to low-latency mode in the smallest scope rather than for the entire equalizer menu. Also mark some more functions as static.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16888 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dan Everton 2008-03-30 09:31:09 +00:00
parent 52527a4d1d
commit ad74906e18
1 changed files with 49 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

99
apps/menus/eq_menu.c
View file

@ -66,7 +66,7 @@ void eq_precut_format(char* buffer, size_t buffer_size, int value, const char* u
/* /*
* Settings functions * Settings functions
*/ */
void eq_apply(void) static void eq_apply(void)
{ {
int i; int i;
dsp_set_eq(global_settings.eq_enabled); dsp_set_eq(global_settings.eq_enabled);
@ -76,37 +76,52 @@ void eq_apply(void)
dsp_set_eq_coefs(i); dsp_set_eq_coefs(i);
} }
} }
int enable_callback(int action, const struct menu_item_ex *this_item)
static int eq_setting_callback(int action, const struct menu_item_ex *this_item)
{ {
(void)this_item; switch (action)
if (action == ACTION_EXIT_MENUITEM) {
case ACTION_ENTER_MENUITEM:
action = lowlatency_callback(action, this_item);
break;
case ACTION_EXIT_MENUITEM:
eq_apply(); eq_apply();
return action; action = lowlatency_callback(action, this_item);
} break;
MENUITEM_SETTING(eq_enable, &global_settings.eq_enabled, enable_callback);
MENUITEM_SETTING(eq_precut, &global_settings.eq_precut, enable_callback);
int dsp_set_coefs_callback(int action, const struct menu_item_ex *this_item)
{
(void)this_item;
if (action == ACTION_EXIT_MENUITEM)
{
/* for now, set every band... figure out a better way later */
int i=0;
for (i=0; i<5; i++)
dsp_set_eq_coefs(i);
}
return action;
} }
char* gainitem_get_name(int selected_item, void * data, char *buffer) return action;
}
MENUITEM_SETTING(eq_enable, &global_settings.eq_enabled, eq_setting_callback);
MENUITEM_SETTING(eq_precut, &global_settings.eq_precut, eq_setting_callback);
MENUITEM_SETTING(cutoff_0, &global_settings.eq_band0_cutoff, eq_setting_callback);
MENUITEM_SETTING(cutoff_1, &global_settings.eq_band1_cutoff, eq_setting_callback);
MENUITEM_SETTING(cutoff_2, &global_settings.eq_band2_cutoff, eq_setting_callback);
MENUITEM_SETTING(cutoff_3, &global_settings.eq_band3_cutoff, eq_setting_callback);
MENUITEM_SETTING(cutoff_4, &global_settings.eq_band4_cutoff, eq_setting_callback);
MENUITEM_SETTING(q_0, &global_settings.eq_band0_q, eq_setting_callback);
MENUITEM_SETTING(q_1, &global_settings.eq_band1_q, eq_setting_callback);
MENUITEM_SETTING(q_2, &global_settings.eq_band2_q, eq_setting_callback);
MENUITEM_SETTING(q_3, &global_settings.eq_band3_q, eq_setting_callback);
MENUITEM_SETTING(q_4, &global_settings.eq_band4_q, eq_setting_callback);
MENUITEM_SETTING(gain_0, &global_settings.eq_band0_gain, eq_setting_callback);
MENUITEM_SETTING(gain_1, &global_settings.eq_band1_gain, eq_setting_callback);
MENUITEM_SETTING(gain_2, &global_settings.eq_band2_gain, eq_setting_callback);
MENUITEM_SETTING(gain_3, &global_settings.eq_band3_gain, eq_setting_callback);
MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, eq_setting_callback);
static char* gainitem_get_name(int selected_item, void * data, char *buffer)
{ {
(void)selected_item; (void)selected_item;
int *setting = (int*)data; int *setting = (int*)data;
snprintf(buffer, MAX_PATH, str(LANG_EQUALIZER_GAIN_ITEM), *setting); snprintf(buffer, MAX_PATH, str(LANG_EQUALIZER_GAIN_ITEM), *setting);
return buffer; return buffer;
} }
int gainitem_speak_item(int selected_item, void * data)
static int gainitem_speak_item(int selected_item, void * data)
{ {
(void)selected_item; (void)selected_item;
int *setting = (int*)data; int *setting = (int*)data;
@ -115,32 +130,16 @@ int gainitem_speak_item(int selected_item, void * data)
return 0; return 0;
} }
int do_option(void* param) static int do_option(void * param)
{ {
const struct menu_item_ex *setting = (const struct menu_item_ex*)param; const struct menu_item_ex *setting = (const struct menu_item_ex*)param;
lowlatency_callback(ACTION_ENTER_MENUITEM, setting);
do_setting_from_menu(setting); do_setting_from_menu(setting);
eq_apply(); eq_apply();
lowlatency_callback(ACTION_EXIT_MENUITEM, setting);
return 0; return 0;
} }
MENUITEM_SETTING(cutoff_0, &global_settings.eq_band0_cutoff, dsp_set_coefs_callback);
MENUITEM_SETTING(cutoff_1, &global_settings.eq_band1_cutoff, dsp_set_coefs_callback);
MENUITEM_SETTING(cutoff_2, &global_settings.eq_band2_cutoff, dsp_set_coefs_callback);
MENUITEM_SETTING(cutoff_3, &global_settings.eq_band3_cutoff, dsp_set_coefs_callback);
MENUITEM_SETTING(cutoff_4, &global_settings.eq_band4_cutoff, dsp_set_coefs_callback);
MENUITEM_SETTING(q_0, &global_settings.eq_band0_q, dsp_set_coefs_callback);
MENUITEM_SETTING(q_1, &global_settings.eq_band1_q, dsp_set_coefs_callback);
MENUITEM_SETTING(q_2, &global_settings.eq_band2_q, dsp_set_coefs_callback);
MENUITEM_SETTING(q_3, &global_settings.eq_band3_q, dsp_set_coefs_callback);
MENUITEM_SETTING(q_4, &global_settings.eq_band4_q, dsp_set_coefs_callback);
MENUITEM_SETTING(gain_0, &global_settings.eq_band0_gain, dsp_set_coefs_callback);
MENUITEM_SETTING(gain_1, &global_settings.eq_band1_gain, dsp_set_coefs_callback);
MENUITEM_SETTING(gain_2, &global_settings.eq_band2_gain, dsp_set_coefs_callback);
MENUITEM_SETTING(gain_3, &global_settings.eq_band3_gain, dsp_set_coefs_callback);
MENUITEM_SETTING(gain_4, &global_settings.eq_band4_gain, dsp_set_coefs_callback);
MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM,
do_option, (void*)&gain_0, do_option, (void*)&gain_0,
gainitem_get_name, gainitem_speak_item, gainitem_get_name, gainitem_speak_item,
@ -170,14 +169,16 @@ static const struct menu_item_ex *band_items[3][3] = {
{ &cutoff_2, &q_2, &gain_2 }, { &cutoff_2, &q_2, &gain_2 },
{ &cutoff_3, &q_3, &gain_3 } { &cutoff_3, &q_3, &gain_3 }
}; };
char* centerband_get_name(int selected_item, void * data, char *buffer)
static char* centerband_get_name(int selected_item, void * data, char *buffer)
{ {
(void)selected_item; (void)selected_item;
int band = (intptr_t)data; int band = (intptr_t)data;
snprintf(buffer, MAX_PATH, str(LANG_EQUALIZER_BAND_PEAK), band); snprintf(buffer, MAX_PATH, str(LANG_EQUALIZER_BAND_PEAK), band);
return buffer; return buffer;
} }
int centerband_speak_item(int selected_item, void * data)
static int centerband_speak_item(int selected_item, void * data)
{ {
(void)selected_item; (void)selected_item;
int band = (intptr_t)data; int band = (intptr_t)data;
@ -185,7 +186,8 @@ int centerband_speak_item(int selected_item, void * data)
talk_number(band, true); talk_number(band, true);
return 0; return 0;
} }
int do_center_band_menu(void* param)
static int do_center_band_menu(void* param)
{ {
int band = (intptr_t)param; int band = (intptr_t)param;
struct menu_item_ex menu; struct menu_item_ex menu;
@ -202,6 +204,7 @@ int do_center_band_menu(void* param)
do_menu(&menu, NULL, NULL, false); do_menu(&menu, NULL, NULL, false);
return 0; return 0;
} }
MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL, MAKE_MENU(band_0_menu, ID2P(LANG_EQUALIZER_BAND_LOW_SHELF), NULL,
Icon_EQ, &cutoff_0, &q_0, &gain_0); Icon_EQ, &cutoff_0, &q_0, &gain_0);
MENUITEM_FUNCTION_DYNTEXT(band_1_menu, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION_DYNTEXT(band_1_menu, MENU_FUNC_USEPARAM,
@ -586,6 +589,7 @@ bool eq_menu_graphical(void)
screens[i].setfont(FONT_UI); screens[i].setfont(FONT_UI);
screens[i].clear_display(); screens[i].clear_display();
} }
return result; return result;
} }
@ -609,14 +613,15 @@ bool eq_browse_presets(void)
} }
MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), MENUITEM_FUNCTION(eq_graphical, 0, ID2P(LANG_EQUALIZER_GRAPHICAL),
(int(*)(void))eq_menu_graphical, NULL, NULL, (int(*)(void))eq_menu_graphical, NULL, lowlatency_callback,
Icon_EQ); Icon_EQ);
MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE), MENUITEM_FUNCTION(eq_save, 0, ID2P(LANG_EQUALIZER_SAVE),
(int(*)(void))eq_save_preset, NULL, NULL, Icon_NOICON); (int(*)(void))eq_save_preset, NULL, NULL, Icon_NOICON);
MENUITEM_FUNCTION(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE), MENUITEM_FUNCTION(eq_browse, 0, ID2P(LANG_EQUALIZER_BROWSE),
(int(*)(void))eq_browse_presets, NULL, NULL, Icon_NOICON); (int(*)(void))eq_browse_presets, NULL, lowlatency_callback,
Icon_NOICON);
MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), lowlatency_callback, Icon_EQ, MAKE_MENU(equalizer_menu, ID2P(LANG_EQUALIZER), NULL, Icon_EQ,
&eq_enable, &eq_graphical, &eq_precut, &gain_menu, &eq_enable, &eq_graphical, &eq_precut, &gain_menu,
&advanced_eq_menu_, &eq_save, &eq_browse); &advanced_eq_menu_, &eq_save, &eq_browse);