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

Fix broken voice when .talk files are used and voice buffer calculation.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30909 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-11-06 12:01:38 +00:00
parent 2ce48832d8
commit 7baa450738
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/talk.c
View file

@ -402,7 +402,6 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize)
if (alloc_size > bufsize) if (alloc_size > bufsize)
goto load_err; goto load_err;
return;
/* now move p_thumbnail behind the voice clip buffer */ /* now move p_thumbnail behind the voice clip buffer */
p_thumbnail = voicebuf.buf + alloc_size; p_thumbnail = voicebuf.buf + alloc_size;
@ -414,6 +413,7 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize)
if (size_for_thumbnail <= 0) if (size_for_thumbnail <= 0)
p_thumbnail = NULL; p_thumbnail = NULL;
return;
load_err: load_err:
p_voicefile = NULL; p_voicefile = NULL;
has_voicefile = false; /* don't try again */ has_voicefile = false; /* don't try again */
@ -778,7 +778,7 @@ void talk_buffer_steal(void)
int talk_id(int32_t id, bool enqueue) int talk_id(int32_t id, bool enqueue)
{ {
long clipsize; long clipsize;
size_t temp = voicefile_size; size_t temp = talk_get_buffer();
unsigned char* clipbuf; unsigned char* clipbuf;
int32_t unit; int32_t unit;
int decimals; int decimals;
@ -795,7 +795,7 @@ int talk_id(int32_t id, bool enqueue)
voicebuf = audio_get_buffer(true, &temp); voicebuf = audio_get_buffer(true, &temp);
if (p_voicefile == NULL && has_voicefile) if (p_voicefile == NULL && has_voicefile)
load_voicefile(false, voicebuf, MIN(voicefile_size,temp)); /* reload needed */ load_voicefile(false, voicebuf, MIN(talk_get_buffer(),temp)); /* reload needed */
if (p_voicefile == NULL) /* still no voices? */ if (p_voicefile == NULL) /* still no voices? */
return -1; return -1;