diff options
| author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-13 21:30:13 +0000 |
|---|---|---|
| committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-02-13 21:30:13 +0000 |
| commit | c0b0cd59050cb5d2254d049c31d6a385b691c987 (patch) | |
| tree | 984206d75fd009e121906f6858c119c81ad7da34 /apps/talk.c | |
| parent | 46dbe3036ca98dbcec70aeb818f1e37a4cca3d10 (diff) | |
| download | rockbox-c0b0cd59050cb5d2254d049c31d6a385b691c987.tar.gz rockbox-c0b0cd59050cb5d2254d049c31d6a385b691c987.zip | |
Do not fiddle with audiobuf in talk_init() when no voice file is present. Avoids stopping of audio playback when changing languages without using voice files. Closes FS#10479.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29300 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/talk.c')
| -rw-r--r-- | apps/talk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/talk.c b/apps/talk.c index ad34437b0f..5fddf85986 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -641,11 +641,6 @@ void talk_init(void) strlcpy((char *)last_lang, (char *)global_settings.lang_file, MAX_FILENAME); -#if CONFIG_CODEC == SWCODEC - audio_get_buffer(false, NULL); /* Must tell audio to reinitialize */ -#endif - reset_state(); /* use this for most of our inits */ - filehandle = open_voicefile(); if (filehandle < 0) { has_voicefile = false; @@ -654,6 +649,11 @@ void talk_init(void) } voicefile_size = filesize(filehandle); + +#if CONFIG_CODEC == SWCODEC + audio_get_buffer(false, NULL); /* Must tell audio to reinitialize */ +#endif + reset_state(); /* use this for most of our inits */ /* test if we can open and if it fits in the audiobuffer */ size_t audiobufsz = audiobufend - audiobuf; |