forked from len0rd/rockbox
Add a voice callback to dynamic menus, along side the text_callback.
From FS#7563. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15042 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
3fd073ed4d
commit
5acf091046
6 changed files with 49 additions and 37 deletions
22
apps/menu.c
22
apps/menu.c
|
|
@ -237,12 +237,22 @@ static void talk_menu_item(const struct menu_item_ex *menu,
|
|||
{
|
||||
if (menu->submenus[sel]->flags&(MENU_DYNAMIC_DESC))
|
||||
{
|
||||
char buffer[80];
|
||||
str = menu->submenus[sel]->menu_get_name_and_icon->
|
||||
list_get_name(sel, menu->submenus[sel]->
|
||||
menu_get_name_and_icon->
|
||||
list_get_name_data, buffer);
|
||||
id = P2ID(str);
|
||||
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];
|
||||
str = menu->submenus[sel]->menu_get_name_and_icon->
|
||||
list_get_name(sel, menu->submenus[sel]->
|
||||
menu_get_name_and_icon->
|
||||
list_get_name_data, buffer);
|
||||
id = P2ID(str);
|
||||
}
|
||||
}
|
||||
else
|
||||
id = P2ID(menu->submenus[sel]->callback_and_desc->desc);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue