From 79ffd047fff7317d902d2120d80a2b45ac766d77 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 6 Nov 2011 12:07:33 +0000 Subject: [PATCH] Fix warning and typos. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30912 a1c6a512-1295-4272-9138-f99709370657 --- apps/mpeg.c | 2 +- apps/playback.c | 2 +- apps/talk.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/mpeg.c b/apps/mpeg.c index 428f758f83..ae33ccc1bf 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c @@ -558,7 +558,7 @@ static struct buflib_callbacks ops = { static size_t audio_talkbuf_init(char *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(); return 0; diff --git a/apps/playback.c b/apps/playback.c index 51a46bdf7e..a245091d91 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -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 * 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 - * 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. */ bool play_queued = queue_peek_ex(&audio_queue, &ev, QPEEK_REMOVE_EVENTS, filter_list); diff --git a/apps/talk.c b/apps/talk.c index b9bfdc82ac..c264bd7179 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -778,7 +778,7 @@ void talk_buffer_steal(void) int talk_id(int32_t id, bool enqueue) { long clipsize; - size_t temp = talk_get_buffer(); + int temp = talk_get_buffer(); unsigned char* clipbuf; int32_t unit; int decimals; @@ -792,7 +792,7 @@ int talk_id(int32_t id, bool enqueue) /* try to get audio buffer until talkbuf_init() is called */ if (!voicebuf) - voicebuf = audio_get_buffer(true, &temp); + voicebuf = audio_get_buffer(true, (size_t*)&temp); if (p_voicefile == NULL && has_voicefile) load_voicefile(false, voicebuf, MIN(talk_get_buffer(),temp)); /* reload needed */