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

shortcuts: voice fixes

Browse source 
- current time wasn't spoken
- 'sleep' shortcuts were voiced as "Time & Date"
- selected item wasn't spoken when returning
from Delete confirmation dialog

Change-Id: I3a3e8b7782323a8c02ae07302ecdfdd742e60908
This commit is contained in:
Christian Soffke 2024-05-13 10:27:07 +02:00
parent 51a5123f5e
commit b8b4fdd999
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
apps/shortcuts.c
View file

@ -440,6 +440,7 @@ static const char * shortcut_menu_get_name(int selected_item, void * data,
return sc->name[0] ? sc->name : sc->u.path; return sc->name[0] ? sc->name : sc->u.path;
} }
static int shortcut_menu_speak_item(int selected_item, void * data);
static int shortcut_menu_get_action(int action, struct gui_synclist *lists) static int shortcut_menu_get_action(int action, struct gui_synclist *lists)
{ {
(void)lists; (void)lists;
@ -454,6 +455,7 @@ static int shortcut_menu_get_action(int action, struct gui_synclist *lists)
if (confirm_delete_yesno("") != YESNO_YES) if (confirm_delete_yesno("") != YESNO_YES)
{ {
gui_synclist_set_title(lists, lists->title, lists->title_icon); gui_synclist_set_title(lists, lists->title, lists->title_icon);
shortcut_menu_speak_item(selection, NULL);
return ACTION_REDRAW; return ACTION_REDRAW;
} }
@ -467,6 +469,8 @@ static int shortcut_menu_get_action(int action, struct gui_synclist *lists)
shortcuts_ata_idle_callback(); shortcuts_ata_idle_callback();
if (shortcut_count == 0) if (shortcut_count == 0)
return ACTION_STD_CANCEL; return ACTION_STD_CANCEL;
shortcut_menu_speak_item(gui_synclist_get_sel_pos(lists), NULL);
return ACTION_REDRAW; return ACTION_REDRAW;
} }
return action; return action;
@ -508,6 +512,7 @@ static enum themable_icons shortcut_menu_get_icon(int selected_item, void * data
return sc->icon; return sc->icon;
} }
void talk_timedate(void);
static int shortcut_menu_speak_item(int selected_item, void * data) static int shortcut_menu_speak_item(int selected_item, void * data)
{ {
(void)data; (void)data;
@ -565,11 +570,15 @@ static int shortcut_menu_speak_item(int selected_item, void * data)
case SHORTCUT_SETTING: case SHORTCUT_SETTING:
talk_id(sc->u.setting->lang_id, false); talk_id(sc->u.setting->lang_id, false);
break; break;
#if CONFIG_RTC
case SHORTCUT_TIME: case SHORTCUT_TIME:
talk_id(LANG_TIME_MENU, false); #if CONFIG_RTC
break; if (sc->u.timedata.talktime)
talk_timedate();
else
#endif #endif
if (sc->name[0])
talk_spell(sc->name, false);
break;
case SHORTCUT_SHUTDOWN: case SHORTCUT_SHUTDOWN:
if (!sc->name[0]) if (!sc->name[0])
{ {
@ -585,7 +594,6 @@ static int shortcut_menu_speak_item(int selected_item, void * data)
return 0; return 0;
} }
void talk_timedate(void);
const char* sleep_timer_formatter(char* buffer, size_t buffer_size, const char* sleep_timer_formatter(char* buffer, size_t buffer_size,
int value, const char* unit); int value, const char* unit);
@ -705,10 +713,7 @@ int do_shortcut_menu(void *ignored)
break; break;
case SHORTCUT_TIME: case SHORTCUT_TIME:
#if CONFIG_RTC #if CONFIG_RTC
if (sc->u.timedata.talktime) { if (!sc->u.timedata.talktime)
talk_timedate();
talk_force_enqueue_next();
} else
#endif #endif
{ {
char timer_buf[10]; char timer_buf[10];