From 5b76936a44de3c7ecd568300f26b5e6421901285 Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Mon, 6 Aug 2007 13:08:36 +0000 Subject: Accept FS#6159 'Add voice to roughly 100 splash screens and yes-no menus' by Stephane Doyon with some minor tweaks by me. Rerun 'configure' and do a 'make clean' before rebuilding your voice files. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14213 a1c6a512-1295-4272-9138-f99709370657 --- apps/root_menu.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'apps/root_menu.c') diff --git a/apps/root_menu.c b/apps/root_menu.c index df59b1b846..b2684abfda 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -129,7 +129,7 @@ static int browser(void* param) /* Maybe just needs to reboot due to delayed commit */ if (stat->commit_delayed) { - gui_syncsplash(HZ*2, str(LANG_PLEASE_REBOOT)); + gui_syncsplash(HZ*2, ID2P(LANG_PLEASE_REBOOT)); break; } @@ -146,7 +146,7 @@ static int browser(void* param) { /* Prompt the user */ reinit_attempted = true; - char *lines[]={str(LANG_TAGCACHE_BUSY), str(LANG_TAGCACHE_FORCE_UPDATE)}; + char *lines[]={ID2P(LANG_TAGCACHE_BUSY), ID2P(LANG_TAGCACHE_FORCE_UPDATE)}; struct text_message message={lines, 2}; if(gui_syncyesno_run(&message, NULL, NULL) == YESNO_NO) break; @@ -159,6 +159,24 @@ static int browser(void* param) } /* Display building progress */ + static long talked_tick = 0; + if(talk_menus_enabled() && + (talked_tick == 0 + || TIME_AFTER(current_tick, talked_tick+7*HZ))) + { + talked_tick = current_tick; + if (stat->commit_step > 0) + { + talk_id(LANG_TAGCACHE_INIT, false); + talk_number(stat->commit_step, true); + talk_id(VOICE_OF, true); + talk_number(tagcache_get_max_commit_step(), true); + } else if(stat->processed_entries) + { + talk_number(stat->processed_entries, false); + talk_id(LANG_BUILDING_DATABASE, true); + } + } if (stat->commit_step > 0) { gui_syncsplash(0, "%s [%d/%d]", @@ -236,7 +254,7 @@ static int wpsscrn(void* param) } else { - gui_syncsplash(HZ*2, str(LANG_NOTHING_TO_RESUME)); + gui_syncsplash(HZ*2, ID2P(LANG_NOTHING_TO_RESUME)); } #if LCD_DEPTH > 1 show_main_backdrop(); -- cgit v1.2.3