summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-04-26 14:40:07 -0400
committerMichael Sevakis <jethead71@rockbox.org>2012-04-26 16:04:42 -0400
commit263955e3f0c22e4f2e025c5972bc3e0f27cb51ad (patch)
treed3566b6fb888f387102f966b33c753b9f449d3a3
parent7f9bb7b823f1fadb56417eb1b1a02b6a7a6aac97 (diff)
downloadrockbox-263955e3f0c22e4f2e025c5972bc3e0f27cb51ad.tar.gz
rockbox-263955e3f0c22e4f2e025c5972bc3e0f27cb51ad.zip
MPEGPlayer: Fixup typecasting for PCM buffer a bit.
Change-Id: I96cca97c1effe5fe2cf84271b123928ebe38e2a7
-rw-r--r--apps/plugins/mpegplayer/pcm_output.c4
-rw-r--r--apps/plugins/mpegplayer/pcm_output.h2
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 */
178unsigned char * pcm_output_get_buffer(ssize_t *size) 178void * 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);
41void pcm_output_play_pause(bool play); 41void pcm_output_play_pause(bool play);
42void pcm_output_stop(void); 42void pcm_output_stop(void);
43void pcm_output_drain(void); 43void pcm_output_drain(void);
44unsigned char * pcm_output_get_buffer(ssize_t *size); 44void * pcm_output_get_buffer(ssize_t *size);
45bool pcm_output_commit_data(ssize_t size, uint32_t timestamp); 45bool pcm_output_commit_data(ssize_t size, uint32_t timestamp);
46bool pcm_output_empty(void); 46bool pcm_output_empty(void);
47 47