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

Add a voice callback to dynamic menus, along side the text_callback.

Browse source 
From FS#7563.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15042 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Stéphane Doyon 2007-10-09 03:48:56 +00:00
parent 3fd073ed4d
commit 5acf091046
6 changed files with 49 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/menu.c
View file

@ -236,6 +236,15 @@ static void talk_menu_item(const struct menu_item_ex *menu,
else else
{ {
if (menu->submenus[sel]->flags&(MENU_DYNAMIC_DESC)) if (menu->submenus[sel]->flags&(MENU_DYNAMIC_DESC))
{
int (*list_speak_item)(int selected_item, void * data)
= menu->submenus[sel]->menu_get_name_and_icon->
list_speak_item;
if(list_speak_item)
list_speak_item(sel, menu->submenus[sel]->
menu_get_name_and_icon->
list_get_name_data);
else
{ {
char buffer[80]; char buffer[80];
str = menu->submenus[sel]->menu_get_name_and_icon-> str = menu->submenus[sel]->menu_get_name_and_icon->
@ -244,6 +253,7 @@ static void talk_menu_item(const struct menu_item_ex *menu,
list_get_name_data, buffer); list_get_name_data, buffer);
id = P2ID(str); id = P2ID(str);
} }
}
else else
id = P2ID(menu->submenus[sel]->callback_and_desc->desc); id = P2ID(menu->submenus[sel]->callback_and_desc->desc);
if (id != -1) if (id != -1)

10
apps/menu.h
View file

@ -90,6 +90,7 @@ struct menu_item_ex {
int (*menu_callback)(int action, int (*menu_callback)(int action,
const struct menu_item_ex *this_item); const struct menu_item_ex *this_item);
char *(*list_get_name)(int selected_item, void * data, char *buffer); char *(*list_get_name)(int selected_item, void * data, char *buffer);
int (*list_speak_item)(int selected_item, void * data);
void *list_get_name_data; void *list_get_name_data;
int icon_id; int icon_id;
} *menu_get_name_and_icon; } *menu_get_name_and_icon;
@ -165,9 +166,9 @@ int do_menu(const struct menu_item_ex *menu, int *start_selected);
/* same as above, except the item name is dynamic */ /* same as above, except the item name is dynamic */
#define MENUITEM_RETURNVALUE_DYNTEXT(name, val, cb, text_callback, \ #define MENUITEM_RETURNVALUE_DYNTEXT(name, val, cb, text_callback, \
text_cb_data, icon) \ voice_callback, text_cb_data, icon) \
static const struct menu_get_name_and_icon name##_ \ static const struct menu_get_name_and_icon name##_ \
= {cb,text_callback,text_cb_data,icon}; \ = {cb,text_callback,voice_callback,text_cb_data,icon}; \
static const struct menu_item_ex name = \ static const struct menu_item_ex name = \
{ MT_RETURN_VALUE|MENU_DYNAMIC_DESC, { .value = val}, \ { MT_RETURN_VALUE|MENU_DYNAMIC_DESC, { .value = val}, \
{.menu_get_name_and_icon = & name##_}}; {.menu_get_name_and_icon = & name##_}};
@ -188,9 +189,10 @@ int do_menu(const struct menu_item_ex *menu, int *start_selected);
/* As above, except the text is dynamic */ /* As above, except the text is dynamic */
#define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, param, \ #define MENUITEM_FUNCTION_DYNTEXT(name, flags, func, param, \
text_callback, text_cb_data, callback, icon) \ text_callback, voice_callback, \
text_cb_data, callback, icon) \
static const struct menu_get_name_and_icon name##_ \ static const struct menu_get_name_and_icon name##_ \
= {callback,text_callback,text_cb_data,icon}; \ = {callback,text_callback,voice_callback,text_cb_data,icon}; \
static const struct menu_func name##__ = {{(void*)func}, param}; \ static const struct menu_func name##__ = {{(void*)func}, param}; \
static const struct menu_item_ex name = \ static const struct menu_item_ex name = \
{ MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \ { MT_FUNCTION_CALL|MENU_DYNAMIC_DESC|flags, \

26
apps/menus/eq_menu.c
View file

@ -145,20 +145,20 @@ 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_3, &global_settings.eq_band3_gain, dsp_set_coefs_callback);
MENUITEM_SETTING(gain_4, &global_settings.eq_band4_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, do_option, (void*)&gain_0, MENUITEM_FUNCTION_DYNTEXT(gain_item_0, MENU_FUNC_USEPARAM, do_option,
gainitem_get_name, &global_settings.eq_band0_cutoff, (void*)&gain_0, gainitem_get_name, NULL, &global_settings.eq_band0_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MENUITEM_FUNCTION_DYNTEXT(gain_item_1, MENU_FUNC_USEPARAM, do_option, (void*)&gain_1, MENUITEM_FUNCTION_DYNTEXT(gain_item_1, MENU_FUNC_USEPARAM, do_option,
gainitem_get_name, &global_settings.eq_band1_cutoff, (void*)&gain_1, gainitem_get_name, NULL, &global_settings.eq_band1_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MENUITEM_FUNCTION_DYNTEXT(gain_item_2, MENU_FUNC_USEPARAM, do_option, (void*)&gain_2, MENUITEM_FUNCTION_DYNTEXT(gain_item_2, MENU_FUNC_USEPARAM, do_option,
gainitem_get_name, &global_settings.eq_band2_cutoff, (void*)&gain_2, gainitem_get_name, NULL, &global_settings.eq_band2_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MENUITEM_FUNCTION_DYNTEXT(gain_item_3, MENU_FUNC_USEPARAM, do_option, (void*)&gain_3, MENUITEM_FUNCTION_DYNTEXT(gain_item_3, MENU_FUNC_USEPARAM, do_option,
gainitem_get_name, &global_settings.eq_band3_cutoff, (void*)&gain_3, gainitem_get_name, NULL, &global_settings.eq_band3_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MENUITEM_FUNCTION_DYNTEXT(gain_item_4, MENU_FUNC_USEPARAM, do_option, (void*)&gain_4, MENUITEM_FUNCTION_DYNTEXT(gain_item_4, MENU_FUNC_USEPARAM, do_option,
gainitem_get_name, &global_settings.eq_band4_cutoff, (void*)&gain_4, gainitem_get_name, NULL, &global_settings.eq_band4_cutoff,
NULL, Icon_NOICON); NULL, Icon_NOICON);
MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0, MAKE_MENU(gain_menu, ID2P(LANG_EQUALIZER_GAIN), NULL, Icon_NOICON, &gain_item_0,
@ -197,13 +197,13 @@ 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,
do_center_band_menu, (void*)1, do_center_band_menu, (void*)1,
centerband_get_name, (void*)1, NULL, Icon_EQ); centerband_get_name, NULL, (void*)1, NULL, Icon_EQ);
MENUITEM_FUNCTION_DYNTEXT(band_2_menu, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION_DYNTEXT(band_2_menu, MENU_FUNC_USEPARAM,
do_center_band_menu, (void*)2, do_center_band_menu, (void*)2,
centerband_get_name, (void*)2, NULL, Icon_EQ); centerband_get_name, NULL, (void*)2, NULL, Icon_EQ);
MENUITEM_FUNCTION_DYNTEXT(band_3_menu, MENU_FUNC_USEPARAM, MENUITEM_FUNCTION_DYNTEXT(band_3_menu, MENU_FUNC_USEPARAM,
do_center_band_menu, (void*)3, do_center_band_menu, (void*)3,
centerband_get_name, (void*)3, NULL, Icon_EQ); centerband_get_name, NULL, (void*)3, NULL, Icon_EQ);
MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL, MAKE_MENU(band_4_menu, ID2P(LANG_EQUALIZER_BAND_HIGH_SHELF), NULL,
Icon_EQ, &cutoff_4, &q_4, &gain_4); Icon_EQ, &cutoff_4, &q_4, &gain_4);

2
apps/onplay.c
View file

@ -1001,7 +1001,7 @@ static int ratingitem_callback(int action,const struct menu_item_ex *this_item)
return action; return action;
} }
MENUITEM_FUNCTION_DYNTEXT(rating_item, 0, set_rating_inline, MENUITEM_FUNCTION_DYNTEXT(rating_item, 0, set_rating_inline,
NULL, rating_name, NULL, NULL, rating_name, NULL, NULL,
ratingitem_callback, Icon_Questionmark); ratingitem_callback, Icon_Questionmark);
#endif #endif

2
apps/recorder/radio.c
View file

@ -1333,7 +1333,7 @@ static int toggle_radio_mode(void)
} }
MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0, MENUITEM_FUNCTION_DYNTEXT(radio_mode_item, 0,
toggle_radio_mode, NULL, toggle_radio_mode, NULL,
get_mode_text, NULL, NULL, Icon_NOICON); get_mode_text, NULL, NULL, NULL, Icon_NOICON);
#endif #endif
static int scan_presets(void) static int scan_presets(void)

2
apps/root_menu.c
View file

@ -362,7 +362,7 @@ char *get_wps_item_name(int selected_item, void * data, char *buffer)
return ID2P(LANG_RESUME_PLAYBACK); return ID2P(LANG_RESUME_PLAYBACK);
} }
MENUITEM_RETURNVALUE_DYNTEXT(wps_item, GO_TO_WPS, NULL, get_wps_item_name, MENUITEM_RETURNVALUE_DYNTEXT(wps_item, GO_TO_WPS, NULL, get_wps_item_name,
NULL, Icon_Playback_menu); NULL, NULL, Icon_Playback_menu);
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING
MENUITEM_RETURNVALUE(rec, ID2P(LANG_RECORDING), GO_TO_RECSCREEN, MENUITEM_RETURNVALUE(rec, ID2P(LANG_RECORDING), GO_TO_RECSCREEN,
NULL, Icon_Recording); NULL, Icon_Recording);