Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move stuff a bit down to fix red on TALK_PARTIAL_LOAD.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30339 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-08-22 10:23:11 +00:00
parent b66d07a9e3
commit fbde6baab5
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/talk.c
View file

@ -354,14 +354,6 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize)
logf("Incompatible voice file");
goto load_err;
}
p_thumbnail = voicebuf.buf + file_size;
p_thumbnail += (long)p_thumbnail % 2; /* 16-bit align */
size_for_thumbnail = voicebuf.buf + bufsize - p_thumbnail;
#if CONFIG_CODEC == SWCODEC
size_for_thumbnail = MIN(size_for_thumbnail, MAX_THUMBNAIL_BUFSIZE);
#endif
if (size_for_thumbnail <= 0)
p_thumbnail = NULL;
}
else
goto load_err;
@ -403,11 +395,26 @@ static void load_voicefile(bool probe, char* buf, size_t bufsize)
#ifdef TALK_PARTIAL_LOAD
alloc_size += silence_len + QUEUE_SIZE;
#else
/* allocate for the entire file, TALK_PROGRESSIVE_LOAD doesn't
* load everything just yet */
alloc_size = file_size;
#endif
if (alloc_size > bufsize)
goto load_err;
return;
/* now move p_thumbnail behind the voice clip buffer */
p_thumbnail = voicebuf.buf + alloc_size;
p_thumbnail += (long)p_thumbnail % 2; /* 16-bit align */
size_for_thumbnail = voicebuf.buf + bufsize - p_thumbnail;
#if CONFIG_CODEC == SWCODEC
size_for_thumbnail = MIN(size_for_thumbnail, MAX_THUMBNAIL_BUFSIZE);
#endif
if (size_for_thumbnail <= 0)
p_thumbnail = NULL;
load_err:
p_voicefile = NULL;
has_voicefile = false; /* don't try again */