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

Fix warning and typos.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30912 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-11-06 12:07:33 +00:00
parent 661311256a
commit 79ffd047ff
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/mpeg.c
View file

@ -558,7 +558,7 @@ static struct buflib_callbacks ops = {
static size_t audio_talkbuf_init(char *bufstart) static size_t audio_talkbuf_init(char *bufstart)
{ {
size_t ret = talkbuf_init(bufstart); size_t ret = talkbuf_init(bufstart);
if (bufstart > (size_t)audiobuflen) /* does the voice even fit? */ if (ret > (size_t)audiobuflen) /* does the voice even fit? */
{ {
talk_buffer_steal(); talk_buffer_steal();
return 0; return 0;

2
apps/playback.c
View file

@ -854,7 +854,7 @@ static int shrink_callback(int handle, unsigned hints, void* start, size_t old_s
* we're called another time. However this has another problem: id3->offset * we're called another time. However this has another problem: id3->offset
* gets zero since playback is stopped. Therefore, try to peek at the * gets zero since playback is stopped. Therefore, try to peek at the
* queue_post from the last call to get the correct offset. This also * queue_post from the last call to get the correct offset. This also
* lets us conviniently remove the queue event so Q_AUDIO_START is only * lets us conviniently remove the queue event so Q_AUDIO_PLAY is only
* processed once. */ * processed once. */
bool play_queued = queue_peek_ex(&audio_queue, &ev, QPEEK_REMOVE_EVENTS, filter_list); bool play_queued = queue_peek_ex(&audio_queue, &ev, QPEEK_REMOVE_EVENTS, filter_list);

4
apps/talk.c
View file

@ -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 = talk_get_buffer(); int temp = talk_get_buffer();
unsigned char* clipbuf; unsigned char* clipbuf;
int32_t unit; int32_t unit;
int decimals; int decimals;
@ -792,7 +792,7 @@ int talk_id(int32_t id, bool enqueue)
/* try to get audio buffer until talkbuf_init() is called */ /* try to get audio buffer until talkbuf_init() is called */
if (!voicebuf) if (!voicebuf)
voicebuf = audio_get_buffer(true, &temp); voicebuf = audio_get_buffer(true, (size_t*)&temp);
if (p_voicefile == NULL && has_voicefile) if (p_voicefile == NULL && has_voicefile)
load_voicefile(false, voicebuf, MIN(talk_get_buffer(),temp)); /* reload needed */ load_voicefile(false, voicebuf, MIN(talk_get_buffer(),temp)); /* reload needed */