diff options
Diffstat (limited to 'firmware/target/hosted/sdl/pcm-sdl.c')
-rw-r--r-- | firmware/target/hosted/sdl/pcm-sdl.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c index ee92fa208d..03e6e1336c 100644 --- a/firmware/target/hosted/sdl/pcm-sdl.c +++ b/firmware/target/hosted/sdl/pcm-sdl.c | |||
@@ -228,15 +228,9 @@ static void sdl_audio_callback(struct pcm_udata *udata, Uint8 *stream, int len) | |||
228 | 228 | ||
229 | /* Audio card wants more? Get some more then. */ | 229 | /* Audio card wants more? Get some more then. */ |
230 | while (len > 0) { | 230 | while (len > 0) { |
231 | if ((ssize_t)pcm_data_size <= 0) { | 231 | pcm_play_get_more_callback(&pcm_data, &pcm_data_size); |
232 | pcm_data_size = 0; | ||
233 | |||
234 | if (pcm_callback_for_more) | ||
235 | pcm_callback_for_more(&pcm_data, &pcm_data_size); | ||
236 | } | ||
237 | |||
238 | if (pcm_data_size > 0) { | ||
239 | start: | 232 | start: |
233 | if (pcm_data_size != 0) { | ||
240 | udata->num_in = pcm_data_size / pcm_sample_bytes; | 234 | udata->num_in = pcm_data_size / pcm_sample_bytes; |
241 | udata->num_out = len / pcm_sample_bytes; | 235 | udata->num_out = len / pcm_sample_bytes; |
242 | 236 | ||
@@ -251,8 +245,6 @@ static void sdl_audio_callback(struct pcm_udata *udata, Uint8 *stream, int len) | |||
251 | len -= udata->num_out; | 245 | len -= udata->num_out; |
252 | } else { | 246 | } else { |
253 | DEBUGF("sdl_audio_callback: No Data.\n"); | 247 | DEBUGF("sdl_audio_callback: No Data.\n"); |
254 | pcm_play_dma_stop(); | ||
255 | pcm_play_dma_stopped_callback(); | ||
256 | break; | 248 | break; |
257 | } | 249 | } |
258 | } | 250 | } |
@@ -292,12 +284,6 @@ void pcm_rec_dma_stop(void) | |||
292 | { | 284 | { |
293 | } | 285 | } |
294 | 286 | ||
295 | void pcm_rec_dma_record_more(void *start, size_t size) | ||
296 | { | ||
297 | (void)start; | ||
298 | (void)size; | ||
299 | } | ||
300 | |||
301 | unsigned long pcm_rec_status(void) | 287 | unsigned long pcm_rec_status(void) |
302 | { | 288 | { |
303 | return 0; | 289 | return 0; |