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

3 files changed, 57 insertions, 2 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 5f437824b8..82bf7541f2 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -294,7 +294,7 @@ bool gui_wps_display(void)
 #ifdef HAVE_LCD_BITMAP
         gui_syncstatusbar_draw(&statusbars, true);
 #endif
-        gui_syncsplash(HZ, str(LANG_END_PLAYLIST));
+        gui_syncsplash(HZ, ID2P(LANG_END_PLAYLIST));
         return true;
     }
     else
diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index 72279a371d..94d9ef6a5c 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -22,6 +22,9 @@
 #include "stdio.h"
 #include "kernel.h"
 #include "screen_access.h"
+#include "lang.h"
+#include "settings.h"
+#include "talk.h"
 
 #ifndef MAX
 #define MAX(a, b) (((a)>(b))?(a):(b))
@@ -197,6 +200,15 @@ void gui_syncsplash(int ticks, const unsigned char *fmt, ...)
 {
     va_list ap;
     int i;
+    long id;
+    /* fmt may be a so called virtual pointer. See settings.h. */
+    if((id = P2ID(fmt)) >= 0)
+        /* If fmt specifies a voicefont ID, and voice menus are
+           enabled, then speak it. */
+        cond_talk_ids_fq(id);
+    /* If fmt is a lang ID then get the corresponding string (which
+       still might contain % place holders). */
+    fmt = P2STR(fmt);
     va_start( ap, fmt );
     FOR_NB_SCREENS(i)
         splash(&(screens[i]), fmt, ap);
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index b689ad923b..69912637f4 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -23,6 +23,7 @@
 #include "misc.h"
 #include "lang.h"
 #include "action.h"
+#include "talk.h"
 
 /*
  * Initializes the yesno asker
@@ -97,7 +98,28 @@ static bool gui_yesno_draw_result(struct gui_yesno * yn, enum yesno_res result)
     gui_textarea_put_message(yn->display, message, 0);
     return(true);
 }
+
 #include "debug.h"
+
+/* Processes a text_message whose lines may be virtual pointers
+   representing language / voicefont IDs (see settings.h). Copies out
+   the IDs to the ids array, which is of length maxlen, and replaces
+   the pointers in the text_message with the actual language strings.
+   The ids array is terminated with the TALK_FINAL_ID sentinel
+   element. */
+static void extract_talk_ids(struct text_message *m, long *ids, int maxlen)
+{
+    int line, i=0;
+    if(m)
+        for(line=0; line<m->nb_lines; line++) {
+            long id = P2ID((unsigned char *)m->message_lines[line]);
+            if(id>=0 && i<maxlen-1)
+                ids[i++] = id;
+            m->message_lines[line] = (char *)P2STR((unsigned char *)m->message_lines[line]);
+        }
+    ids[i] = TALK_FINAL_ID;
+}
+
 enum yesno_res gui_syncyesno_run(struct text_message * main_message,
                                  struct text_message * yes_message,
                                  struct text_message * no_message)
@@ -107,6 +129,13 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message,
     int result=-1;
     bool result_displayed;
     struct gui_yesno yn[NB_SCREENS];
+    long voice_ids[5];
+    long talked_tick = 0;
+    /* The text messages may contain virtual pointers to IDs (see
+       settings.h) instead of plain strings. Copy the IDs out so we
+       can speak them, and unwrap the actual language strings. */
+    extract_talk_ids(main_message, voice_ids,
+                     sizeof(voice_ids)/sizeof(voice_ids[0]));
     FOR_NB_SCREENS(i)
     {
         gui_yesno_init(&(yn[i]), main_message, yes_message, no_message);
@@ -115,7 +144,14 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message,
     }
     while (result==-1)
     {
-        button = get_action(CONTEXT_YESNOSCREEN,TIMEOUT_BLOCK);
+        /* Repeat the question every 5secs (more or less) */
+        if (talk_menus_enabled()
+            && (talked_tick==0 || TIME_AFTER(current_tick, talked_tick+HZ*5)))
+        {
+            talked_tick = current_tick;
+            talk_idarray(voice_ids, false);
+        }
+        button = get_action(CONTEXT_YESNOSCREEN, HZ*5);
         switch (button)
         {
             case ACTION_YESNO_ACCEPT:
@@ -133,6 +169,13 @@ enum yesno_res gui_syncyesno_run(struct text_message * main_message,
     }
     FOR_NB_SCREENS(i)
         result_displayed=gui_yesno_draw_result(&(yn[i]), result);
+    extract_talk_ids((result == YESNO_YES) ? yes_message : no_message,
+                     voice_ids, sizeof(voice_ids)/sizeof(voice_ids[0]));
+    if (talk_menus_enabled())
+    {
+        talk_idarray(voice_ids, false);
+        talk_force_enqueue_next();
+    }
     if(result_displayed)
         sleep(HZ);
     return(result);