summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJörg Hohensohn <hohensoh@rockbox.org>2004-04-06 07:06:59 +0000
committerJörg Hohensohn <hohensoh@rockbox.org>2004-04-06 07:06:59 +0000
commit6e77d1fe39cd07bd4ec39ea595e9ec7ac2ac7d34 (patch)
tree110141f754982db12b5f5760840bfdb12e9e09ef /apps
parent4af9331ed2370797ce3b71e4cd1f2b679542a225 (diff)
downloadrockbox-6e77d1fe39cd07bd4ec39ea595e9ec7ac2ac7d34.tar.gz
rockbox-6e77d1fe39cd07bd4ec39ea595e9ec7ac2ac7d34.tar.bz2
rockbox-6e77d1fe39cd07bd4ec39ea595e9ec7ac2ac7d34.zip
Voice UI searches for <mylanguage>.voice, no hard-coded "english.voice" any more. We can localize the voice now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4471 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/settings.c4
-rw-r--r--apps/talk.c25
-rw-r--r--apps/tree.c1
3 files changed, 27 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 2e1a664286..865e84dafe 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -587,6 +587,7 @@ void settings_apply(void)
snprintf(buf, sizeof buf, ROCKBOX_DIR LANG_DIR "/%s.lng",
global_settings.lang_file);
lang_load(buf);
+ talk_init(); /* use voice of same language */
}
set_car_adapter_mode(global_settings.car_adapter_mode);
@@ -974,7 +975,10 @@ bool settings_load_config(char* file)
}
else if (!strcasecmp(name, "lang")) {
if (!lang_load(value))
+ {
set_file(value, global_settings.lang_file, MAX_FILENAME);
+ talk_init(); /* use voice of same language */
+ }
}
else if (!strcasecmp(name, "bidir limit"))
set_cfg_int(&global_settings.bidir_limit, value, 0, 200);
diff --git a/apps/talk.c b/apps/talk.c
index a0c730cbcc..9ea547bb16 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -26,6 +26,7 @@
#include "file.h"
#include "buffer.h"
#include "system.h"
+#include "settings.h"
#include "mp3_playback.h"
#include "mpeg.h"
#include "lang.h"
@@ -36,7 +37,6 @@ extern void bitswap(unsigned char *data, int length); /* no header for this */
/***************** Constants *****************/
#define QUEUE_SIZE 50
-const char* voicefont_file = "/.rockbox/langs/english.voice";
const char* dir_thumbnail_name = ".dirname.mp3";
@@ -84,10 +84,29 @@ static int load_voicefont(void);
static void mp3_callback(unsigned char** start, int* size);
static int shutup(void);
static int queue_clip(unsigned char* buf, int size, bool enqueue);
+static int open_voicefile(void);
/***************** Private implementation *****************/
+static int open_voicefile(void)
+{
+ char buf[64];
+ char* p_lang = "english"; /* default */
+
+ if ( global_settings.lang_file[0] &&
+ global_settings.lang_file[0] != 0xff )
+ { /* try to open the voice file of the selected language */
+ p_lang = global_settings.lang_file;
+ }
+
+ snprintf(buf, sizeof(buf), ROCKBOX_DIR LANG_DIR "/%s.voice", p_lang);
+
+ return open(buf, O_RDONLY);
+}
+
+
+
static int load_voicefont(void)
{
int fd;
@@ -95,7 +114,7 @@ static int load_voicefont(void)
p_voicefont = NULL; /* indicate no voicefont if we fail below */
- fd = open(voicefont_file, O_RDONLY);
+ fd = open_voicefile();
if (fd < 0) /* failed to open */
{
p_voicefont = NULL; /* indicate no voicefont */
@@ -253,7 +272,7 @@ void talk_init(void)
{
int fd;
- fd = open(voicefont_file, O_RDONLY);
+ fd = open_voicefile();
if (fd >= 0) /* success */
{
close(fd);
diff --git a/apps/tree.c b/apps/tree.c
index 31fe0e2d4b..8417e9a65e 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -1176,6 +1176,7 @@ static bool dirbrowse(char *root, int *dirfilter)
if(!lang_load(buf)) {
set_file(buf, global_settings.lang_file,
MAX_FILENAME);
+ talk_init(); /* use voice of same language */
splash(HZ, true, str(LANG_LANGUAGE_LOADED));
restore = true;
}