diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2012-04-26 14:40:07 -0400 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2012-04-26 16:04:42 -0400 |
commit | 263955e3f0c22e4f2e025c5972bc3e0f27cb51ad (patch) | |
tree | d3566b6fb888f387102f966b33c753b9f449d3a3 /apps | |
parent | 7f9bb7b823f1fadb56417eb1b1a02b6a7a6aac97 (diff) | |
download | rockbox-263955e3f0c22e4f2e025c5972bc3e0f27cb51ad.tar.gz rockbox-263955e3f0c22e4f2e025c5972bc3e0f27cb51ad.zip |
MPEGPlayer: Fixup typecasting for PCM buffer a bit.
Change-Id: I96cca97c1effe5fe2cf84271b123928ebe38e2a7
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/mpegplayer/pcm_output.c | 4 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/pcm_output.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/plugins/mpegplayer/pcm_output.c b/apps/plugins/mpegplayer/pcm_output.c index 8694ae4a69..3af8e91adc 100644 --- a/apps/plugins/mpegplayer/pcm_output.c +++ b/apps/plugins/mpegplayer/pcm_output.c | |||
@@ -164,7 +164,7 @@ static void get_more(const void **start, size_t *size) | |||
164 | clock_time += sizeof (silence) / 4; | 164 | clock_time += sizeof (silence) / 4; |
165 | clock_tick += sizeof (silence) / 4; | 165 | clock_tick += sizeof (silence) / 4; |
166 | 166 | ||
167 | *start = (unsigned char *)silence; | 167 | *start = silence; |
168 | *size = sizeof (silence); | 168 | *size = sizeof (silence); |
169 | 169 | ||
170 | if (sz < 0) | 170 | if (sz < 0) |
@@ -175,7 +175,7 @@ static void get_more(const void **start, size_t *size) | |||
175 | 175 | ||
176 | /* Return a buffer pointer if at least size bytes are available and if so, | 176 | /* Return a buffer pointer if at least size bytes are available and if so, |
177 | * give the actual free space */ | 177 | * give the actual free space */ |
178 | unsigned char * pcm_output_get_buffer(ssize_t *size) | 178 | void * pcm_output_get_buffer(ssize_t *size) |
179 | { | 179 | { |
180 | ssize_t sz = *size; | 180 | ssize_t sz = *size; |
181 | ssize_t free = pcm_output_bytes_free() - PCM_HDR_SIZE; | 181 | ssize_t free = pcm_output_bytes_free() - PCM_HDR_SIZE; |
diff --git a/apps/plugins/mpegplayer/pcm_output.h b/apps/plugins/mpegplayer/pcm_output.h index 1a00ac48e6..bae00cd045 100644 --- a/apps/plugins/mpegplayer/pcm_output.h +++ b/apps/plugins/mpegplayer/pcm_output.h | |||
@@ -41,7 +41,7 @@ uint32_t pcm_output_get_ticks(uint32_t *start); | |||
41 | void pcm_output_play_pause(bool play); | 41 | void pcm_output_play_pause(bool play); |
42 | void pcm_output_stop(void); | 42 | void pcm_output_stop(void); |
43 | void pcm_output_drain(void); | 43 | void pcm_output_drain(void); |
44 | unsigned char * pcm_output_get_buffer(ssize_t *size); | 44 | void * pcm_output_get_buffer(ssize_t *size); |
45 | bool pcm_output_commit_data(ssize_t size, uint32_t timestamp); | 45 | bool pcm_output_commit_data(ssize_t size, uint32_t timestamp); |
46 | bool pcm_output_empty(void); | 46 | bool pcm_output_empty(void); |
47 | 47 | ||