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
This commit is contained in:
parent
46dbe3036c
commit
c0b0cd5905
1 changed files with 5 additions and 5 deletions
10
apps/talk.c
10
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;
|
||||
|
|
Loading…
Reference in a new issue