commit 9e0495711aa8bdc6d8413e447c984e178bbbceae
author Jörg Hohensohn <hohensoh@rockbox.org> Fri May 21 06:29:55 2004 +0000
committer Jörg Hohensohn <hohensoh@rockbox.org> Fri May 21 06:29:55 2004 +0000
tree 15e8abbf1e72558fd6bcd08d8a3309632bda9058
parent 4c67f0f3bbc3507c2cb06090d86c874a9d7f662d

voice in keyboard, inspired by Christopher Moore


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4657 a1c6a512-1295-4272-9138-f99709370657

apps/recorder/keyboard.c

diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index b39a3ae..32a1d8b 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -26,6 +26,8 @@
 #include "font.h"
 #include "screens.h"
 #include "status.h"
+#include "talk.h"
+#include "settings.h"
 
 #define KEYBOARD_LINES 4
 #define KEYBOARD_PAGES 3
@@ -56,6 +58,20 @@
     }
 }
 
+/* helper function to spell a char if voice UI is enabled */
+void kbd_spellchar(char c)
+{
+    char spell_char[2]; /* store char to pass to talk_spell */
+
+    if (global_settings.talk_menu) /* voice UI? */
+    {
+        spell_char[0] = c; 
+        spell_char[1] = '\0'; /* mark end of char string */ 
+
+        talk_spell(spell_char, false); 
+    }
+}
+
 int kbd_input(char* text, int buflen)
 {
     bool done = false;
@@ -89,6 +105,9 @@
     max_chars = LCD_WIDTH / font_w;
     kbd_setupkeys(line, page);
 
+    if (global_settings.talk_menu) /* voice UI? */
+        talk_spell(text, true); /* spell initial text */ 
+
     while(!done)
     {
         len = strlen(text);
@@ -188,6 +207,7 @@
                 if (++page == KEYBOARD_PAGES)
                     page = 0;
                 kbd_setupkeys(line, page);
+                kbd_spellchar(line[y][x]);
                 break;
 
             case BUTTON_RIGHT:
@@ -196,6 +216,7 @@
                     x++;
                 else
                     x = 0;
+                kbd_spellchar(line[y][x]);
                 break;
 
             case BUTTON_LEFT:
@@ -204,6 +225,7 @@
                     x--;
                 else
                     x = strlen(line[y]) - 1;
+                kbd_spellchar(line[y][x]);
                 break;
 
             case BUTTON_DOWN:
@@ -212,6 +234,7 @@
                     y++;
                 else
                     y=0;
+                kbd_spellchar(line[y][x]);
                 break;
 
             case BUTTON_UP:
@@ -220,6 +243,7 @@
                     y--;
                 else
                     y = KEYBOARD_LINES - 1;
+                kbd_spellchar(line[y][x]);
                 break;
 
             case BUTTON_F3:
@@ -261,6 +285,8 @@
                     }
                     editpos++;
                 }
+                if (global_settings.talk_menu) /* voice UI? */
+                    talk_spell(text, false); /* speak revised text */
                 break;
 
             case BUTTON_ON | BUTTON_RIGHT:
@@ -269,6 +295,8 @@
                 editpos++;
                 if (editpos > len)
                     editpos = len;
+                else
+                    kbd_spellchar(text[editpos]);
                 break;
 
             case BUTTON_ON | BUTTON_LEFT:
@@ -277,6 +305,8 @@
                 editpos--;
                 if (editpos < 0)
                     editpos = 0;
+                else
+                    kbd_spellchar(text[editpos]);
                 break;
 
             case SYS_USB_CONNECTED: