diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2012-03-04 08:52:50 -0500 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2012-03-04 08:52:50 -0500 |
| commit | cd8e11b463bf57f832bf44d350238057db3e2d6d (patch) | |
| tree | 91b7511ec5a6fa47c99d84518608cd3b90f4d680 /firmware/target/hosted/sdl | |
| parent | f6e17e86fed65cb503199691d69973e83c45ddbf (diff) | |
| download | rockbox-cd8e11b463bf57f832bf44d350238057db3e2d6d.tar.gz rockbox-cd8e11b463bf57f832bf44d350238057db3e2d6d.zip | |
Tweak some PCM drivers for less typecasting with the data pointer.
Yeah, sizeof (void) here with GCC is 1. If something has a problem
with that, we'll set it straight.
Change-Id: I9ad3eee75dd440f6404a04a501d1533c8bc18ba9
Diffstat (limited to 'firmware/target/hosted/sdl')
| -rw-r--r-- | firmware/target/hosted/sdl/pcm-sdl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c index 2c535b2dc5..bd56189f02 100644 --- a/firmware/target/hosted/sdl/pcm-sdl.c +++ b/firmware/target/hosted/sdl/pcm-sdl.c | |||
| @@ -56,7 +56,7 @@ static int sim_volume = 0; | |||
| 56 | #if CONFIG_CODEC == SWCODEC | 56 | #if CONFIG_CODEC == SWCODEC |
| 57 | static int cvt_status = -1; | 57 | static int cvt_status = -1; |
| 58 | 58 | ||
| 59 | static const Uint8* pcm_data; | 59 | static const void *pcm_data; |
| 60 | static size_t pcm_data_size; | 60 | static size_t pcm_data_size; |
| 61 | static size_t pcm_sample_bytes; | 61 | static size_t pcm_sample_bytes; |
| 62 | static size_t pcm_channel_bytes; | 62 | static size_t pcm_channel_bytes; |
| @@ -245,8 +245,8 @@ static void sdl_audio_callback(struct pcm_udata *udata, Uint8 *stream, int len) | |||
| 245 | 245 | ||
| 246 | /* Audio card wants more? Get some more then. */ | 246 | /* Audio card wants more? Get some more then. */ |
| 247 | while (len > 0) { | 247 | while (len > 0) { |
| 248 | new_buffer = pcm_play_dma_complete_callback(PCM_DMAST_OK, | 248 | new_buffer = pcm_play_dma_complete_callback(PCM_DMAST_OK, &pcm_data, |
| 249 | (const void **)&pcm_data, &pcm_data_size); | 249 | &pcm_data_size); |
| 250 | 250 | ||
| 251 | if (!new_buffer) { | 251 | if (!new_buffer) { |
| 252 | DEBUGF("sdl_audio_callback: No Data.\n"); | 252 | DEBUGF("sdl_audio_callback: No Data.\n"); |