len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-18 17:42:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small voice-related tweaks and fixes to simplelists.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15276 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Stéphane Doyon 2007-10-23 05:19:03 +00:00
parent 5a9a2b7bc4
commit a82a860c7e
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
apps/gui/list.c
View file

@ -1266,15 +1266,14 @@ bool simplelist_show_list(struct simplelist_info *info)
gui_synclist_select_item(&lists, info->start_selection); gui_synclist_select_item(&lists, info->start_selection);
if (info->get_talk)
info->get_talk(gui_synclist_get_sel_pos(&lists), info->callback_data);
gui_synclist_draw(&lists); gui_synclist_draw(&lists);
gui_synclist_speak_item(&lists);
while(1) while(1)
{ {
gui_syncstatusbar_draw(&statusbars, true); gui_syncstatusbar_draw(&statusbars, true);
action = get_action(CONTEXT_STD, info->timeout); if (list_do_action(CONTEXT_STD, info->timeout,
if (gui_synclist_do_button(&lists, &action, LIST_WRAP_UNLESS_HELD)) &lists, &action, LIST_WRAP_UNLESS_HELD))
continue; continue;
if (info->action_callback) if (info->action_callback)
{ {
@ -1289,12 +1288,14 @@ bool simplelist_show_list(struct simplelist_info *info)
if (info->get_name == NULL) if (info->get_name == NULL)
gui_synclist_set_nb_items(&lists, simplelist_line_count*info->selection_size); gui_synclist_set_nb_items(&lists, simplelist_line_count*info->selection_size);
gui_synclist_draw(&lists); gui_synclist_draw(&lists);
gui_synclist_speak_item(&lists);
old_line_count = simplelist_line_count; old_line_count = simplelist_line_count;
} }
else if(default_event_handler(action) == SYS_USB_CONNECTED) else if(default_event_handler(action) == SYS_USB_CONNECTED)
return true; return true;
} }
talk_shutup();
return false; return false;
} }

1
apps/menus/main_menu.c
View file

@ -303,6 +303,7 @@ static bool show_info(void)
simplelist_info_init(&info, str(LANG_ROCKBOX_INFO), 6, (void*)&data); simplelist_info_init(&info, str(LANG_ROCKBOX_INFO), 6, (void*)&data);
info.hide_selection = !global_settings.talk_menu; info.hide_selection = !global_settings.talk_menu;
info.get_name = info_getname; info.get_name = info_getname;
if(global_settings.talk_menu)
info.get_talk = info_speak_item; info.get_talk = info_speak_item;
info.action_callback = info_action_callback; info.action_callback = info_action_callback;
return simplelist_show_list(&info); return simplelist_show_list(&info);