summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-11-06 12:07:33 +0000
committerThomas Martitz <kugel@rockbox.org>2011-11-06 12:07:33 +0000
commit79ffd047fff7317d902d2120d80a2b45ac766d77 (patch)
treee1b473df14a929a2f00747f5e278f1233810bed1
parent661311256a3d3bc81faa2409823338d85571ab59 (diff)
downloadrockbox-79ffd047fff7317d902d2120d80a2b45ac766d77.tar.gz
rockbox-79ffd047fff7317d902d2120d80a2b45ac766d77.zip
Fix warning and typos.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30912 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/mpeg.c2
-rw-r--r--apps/playback.c2
-rw-r--r--apps/talk.c4
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 = {
558static size_t audio_talkbuf_init(char *bufstart) 558static size_t audio_talkbuf_init(char *bufstart)
559{ 559{
560 size_t ret = talkbuf_init(bufstart); 560 size_t ret = talkbuf_init(bufstart);
561 if (bufstart > (size_t)audiobuflen) /* does the voice even fit? */ 561 if (ret > (size_t)audiobuflen) /* does the voice even fit? */
562 { 562 {
563 talk_buffer_steal(); 563 talk_buffer_steal();
564 return 0; 564 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
854 * we're called another time. However this has another problem: id3->offset 854 * we're called another time. However this has another problem: id3->offset
855 * gets zero since playback is stopped. Therefore, try to peek at the 855 * gets zero since playback is stopped. Therefore, try to peek at the
856 * queue_post from the last call to get the correct offset. This also 856 * queue_post from the last call to get the correct offset. This also
857 * lets us conviniently remove the queue event so Q_AUDIO_START is only 857 * lets us conviniently remove the queue event so Q_AUDIO_PLAY is only
858 * processed once. */ 858 * processed once. */
859 bool play_queued = queue_peek_ex(&audio_queue, &ev, QPEEK_REMOVE_EVENTS, filter_list); 859 bool play_queued = queue_peek_ex(&audio_queue, &ev, QPEEK_REMOVE_EVENTS, filter_list);
860 860
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)
778int talk_id(int32_t id, bool enqueue) 778int talk_id(int32_t id, bool enqueue)
779{ 779{
780 long clipsize; 780 long clipsize;
781 size_t temp = talk_get_buffer(); 781 int temp = talk_get_buffer();
782 unsigned char* clipbuf; 782 unsigned char* clipbuf;
783 int32_t unit; 783 int32_t unit;
784 int decimals; 784 int decimals;
@@ -792,7 +792,7 @@ int talk_id(int32_t id, bool enqueue)
792 792
793 /* try to get audio buffer until talkbuf_init() is called */ 793 /* try to get audio buffer until talkbuf_init() is called */
794 if (!voicebuf) 794 if (!voicebuf)
795 voicebuf = audio_get_buffer(true, &temp); 795 voicebuf = audio_get_buffer(true, (size_t*)&temp);
796 796
797 if (p_voicefile == NULL && has_voicefile) 797 if (p_voicefile == NULL && has_voicefile)
798 load_voicefile(false, voicebuf, MIN(talk_get_buffer(),temp)); /* reload needed */ 798 load_voicefile(false, voicebuf, MIN(talk_get_buffer(),temp)); /* reload needed */