devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix red Ondio builds. Hwcodec targets can't beep that way, so disable that beep for them.* Port the other vkeyboard enhancements (fixed character spelling and edit mode announcement) to the charcell vkeyboard (Player).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15064 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-10-10 05:56:53 +00:00
parent ddf33db8c4
commit 100d343963
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
apps/player/keyboard.c
View file

@ -28,6 +28,7 @@
#include "talk.h"
#include "misc.h"
#include "rbunicode.h"
#include "lang.h"
#define KBD_BUF_SIZE 64
#define KEYBOARD_PAGES 3
@ -73,15 +74,25 @@ static unsigned short *kbd_setupkeys(int page, int* len)
/* helper function to spell a char if voice UI is enabled */
static void kbd_spellchar(char c)
{
static char spell_char[2] = "\0\0"; /* store char to pass to talk_spell */
if (talk_menus_enabled()) /* voice UI? */
{
spell_char[0] = c;
talk_spell(spell_char, false);
unsigned char tmp[5];
/* store char to pass to talk_spell */
unsigned char* utf8 = utf8encode(c, tmp);
*utf8 = 0;
if(c == ' ')
talk_id(VOICE_BLANK, false);
else talk_spell(tmp, false);
}
}
static void say_edit(void)
{
if (talk_menus_enabled())
talk_id(VOICE_EDIT, false);
}
int kbd_input(char* text, int buflen)
{
bool done = false;
@ -184,7 +195,9 @@ int kbd_input(char* text, int buflen)
case BUTTON_ON: /* toggle mode */
line_edit = !line_edit;
if (!line_edit)
if (line_edit)
say_edit();
else
kbd_spellchar(line[x]);
break;

10
apps/recorder/keyboard.c
View file

@ -828,8 +828,11 @@ int kbd_input(char* text, int buflen)
{
int c = utf8seek(text, ++editpos);
kbd_spellchar(text[c]);
} else if(talk_menus_enabled())
}
#if CONFIG_CODEC == SWCODEC
else if (talk_menus_enabled())
pcmbuf_beep(1000, 150, 1500);
#endif
}
else
#endif /* KBD_MODES */
@ -870,8 +873,11 @@ int kbd_input(char* text, int buflen)
{
int c = utf8seek(text, --editpos);
kbd_spellchar(text[c]);
} else if(talk_menus_enabled())
}
#if CONFIG_CODEC == SWCODEC
else if (talk_menus_enabled())
pcmbuf_beep(1000, 150, 1500);
#endif
}
else
#endif /* KBD_MODES */