diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-12-05 22:44:42 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-12-05 22:44:42 +0000 |
| commit | f981ea93fb411019133a022c7dd873166d66b5dd (patch) | |
| tree | 4f671d67b6584068d4e388c5fd4b6cdd54b5cca2 /apps/playback.c | |
| parent | 5c3546ccbb14b576fd5eef3815bdfc97047de422 (diff) | |
kill gcc4 warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8162 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playback.c')
| -rw-r--r-- | apps/playback.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/playback.c b/apps/playback.c index c8fd5d81d6..a61b8128ae 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -222,8 +222,8 @@ static void do_swap(int idx_old, int idx_new) memcpy(iram_p, iram_buf[idx_new], CODEC_IRAM_SIZE); #endif - dram_buf[0] = &filebuf[filebuflen+CODEC_IRAM_SIZE*2]; - dram_buf[1] = &filebuf[filebuflen+CODEC_IRAM_SIZE*2+CODEC_SIZE]; + dram_buf[0] = (unsigned char *)&filebuf[filebuflen+CODEC_IRAM_SIZE*2]; + dram_buf[1] = (unsigned char *)&filebuf[filebuflen+CODEC_IRAM_SIZE*2+CODEC_SIZE]; memcpy(dram_buf[idx_old], codecbuf, CODEC_SIZE); memcpy(codecbuf, dram_buf[idx_new], CODEC_SIZE); } @@ -1924,7 +1924,7 @@ void codec_thread(void) static void reset_buffer(void) { - filebuf = &audiobuf[MALLOC_BUFSIZE]; + filebuf = (char *)&audiobuf[MALLOC_BUFSIZE]; filebuflen = audiobufend - audiobuf - pcmbuf_get_bufsize() - PCMBUF_GUARD - MALLOC_BUFSIZE - GUARD_BUFSIZE; @@ -2287,7 +2287,7 @@ void mp3_play_data(const unsigned char* start, int size, void (*get_more)(unsigned char** start, int* size)) { voice_getmore = get_more; - voicebuf = (unsigned char *)start; + voicebuf = (char *)start; voice_remaining = size; voice_is_playing = true; pcmbuf_reset_mixpos(); @@ -2334,7 +2334,7 @@ void audio_set_crossfade(int enable) /* Re-initialize audio system. */ if (was_playing) - gui_syncsplash(0, true, str(LANG_RESTARTING_PLAYBACK)); + gui_syncsplash(0, true, (char *)str(LANG_RESTARTING_PLAYBACK)); pcmbuf_init(size); pcmbuf_crossfade_enable(enable); reset_buffer(); @@ -2385,7 +2385,7 @@ void audio_init(void) filebufused = 0; filling = false; current_codec = CODEC_IDX_AUDIO; - filebuf = &audiobuf[MALLOC_BUFSIZE]; + filebuf = (char *)&audiobuf[MALLOC_BUFSIZE]; playing = false; audio_codec_loaded = false; voice_is_playing = false; |