diff options
Diffstat (limited to 'apps/buffering.c')
-rw-r--r-- | apps/buffering.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index 30601481e4..e39a4b6eca 100644 --- a/apps/buffering.c +++ b/apps/buffering.c | |||
@@ -711,7 +711,7 @@ static void rebuffer_handle(int handle_id, size_t newpos) | |||
711 | rebuffer the whole track, just read enough to satisfy */ | 711 | rebuffer the whole track, just read enough to satisfy */ |
712 | if (newpos > h->offset && newpos - h->offset < BUFFERING_DEFAULT_FILECHUNK) | 712 | if (newpos > h->offset && newpos - h->offset < BUFFERING_DEFAULT_FILECHUNK) |
713 | { | 713 | { |
714 | LOGFQUEUE("buffering >| Q_BUFFER_HANDLE"); | 714 | LOGFQUEUE("buffering >| Q_BUFFER_HANDLE %d", handle_id); |
715 | queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id); | 715 | queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id); |
716 | h->ridx = h->data + newpos; | 716 | h->ridx = h->data + newpos; |
717 | return; | 717 | return; |
@@ -720,7 +720,7 @@ static void rebuffer_handle(int handle_id, size_t newpos) | |||
720 | h->offset = newpos; | 720 | h->offset = newpos; |
721 | 721 | ||
722 | /* Reset the handle to its new offset */ | 722 | /* Reset the handle to its new offset */ |
723 | LOGFQUEUE("buffering >| Q_RESET_HANDLE"); | 723 | LOGFQUEUE("buffering >| Q_RESET_HANDLE %d", handle_id); |
724 | queue_send(&buffering_queue, Q_RESET_HANDLE, handle_id); | 724 | queue_send(&buffering_queue, Q_RESET_HANDLE, handle_id); |
725 | 725 | ||
726 | size_t next = (unsigned)((void *)h->next - (void *)buffer); | 726 | size_t next = (unsigned)((void *)h->next - (void *)buffer); |
@@ -733,7 +733,7 @@ static void rebuffer_handle(int handle_id, size_t newpos) | |||
733 | } | 733 | } |
734 | 734 | ||
735 | /* Now we ask for a rebuffer */ | 735 | /* Now we ask for a rebuffer */ |
736 | LOGFQUEUE("buffering >| Q_BUFFER_HANDLE"); | 736 | LOGFQUEUE("buffering >| Q_BUFFER_HANDLE %d", handle_id); |
737 | queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id); | 737 | queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id); |
738 | } | 738 | } |
739 | 739 | ||
@@ -970,7 +970,7 @@ int bufopen(const char *file, size_t offset, enum data_type type) | |||
970 | if (type == TYPE_CUESHEET) { | 970 | if (type == TYPE_CUESHEET) { |
971 | h->fd = fd; | 971 | h->fd = fd; |
972 | /* Immediately start buffering those */ | 972 | /* Immediately start buffering those */ |
973 | LOGFQUEUE("buffering >| Q_BUFFER_HANDLE"); | 973 | LOGFQUEUE("buffering >| Q_BUFFER_HANDLE %d", h->id); |
974 | queue_send(&buffering_queue, Q_BUFFER_HANDLE, h->id); | 974 | queue_send(&buffering_queue, Q_BUFFER_HANDLE, h->id); |
975 | } else { | 975 | } else { |
976 | /* Other types will get buffered in the course of normal operations */ | 976 | /* Other types will get buffered in the course of normal operations */ |
@@ -1337,7 +1337,7 @@ void buffering_thread(void) | |||
1337 | switch (ev.id) | 1337 | switch (ev.id) |
1338 | { | 1338 | { |
1339 | case Q_START_FILL: | 1339 | case Q_START_FILL: |
1340 | LOGFQUEUE("buffering < Q_START_FILL"); | 1340 | LOGFQUEUE("buffering < Q_START_FILL %d", (int)ev.data); |
1341 | /* Call buffer callbacks here because this is one of two ways | 1341 | /* Call buffer callbacks here because this is one of two ways |
1342 | * to begin a full buffer fill */ | 1342 | * to begin a full buffer fill */ |
1343 | send_event(EVENT_BUFFER_LOW, 0); | 1343 | send_event(EVENT_BUFFER_LOW, 0); |
@@ -1347,19 +1347,19 @@ void buffering_thread(void) | |||
1347 | break; | 1347 | break; |
1348 | 1348 | ||
1349 | case Q_BUFFER_HANDLE: | 1349 | case Q_BUFFER_HANDLE: |
1350 | LOGFQUEUE("buffering < Q_BUFFER_HANDLE"); | 1350 | LOGFQUEUE("buffering < Q_BUFFER_HANDLE %d", (int)ev.data); |
1351 | queue_reply(&buffering_queue, 1); | 1351 | queue_reply(&buffering_queue, 1); |
1352 | buffer_handle((int)ev.data); | 1352 | buffer_handle((int)ev.data); |
1353 | break; | 1353 | break; |
1354 | 1354 | ||
1355 | case Q_RESET_HANDLE: | 1355 | case Q_RESET_HANDLE: |
1356 | LOGFQUEUE("buffering < Q_RESET_HANDLE"); | 1356 | LOGFQUEUE("buffering < Q_RESET_HANDLE %d", (int)ev.data); |
1357 | queue_reply(&buffering_queue, 1); | 1357 | queue_reply(&buffering_queue, 1); |
1358 | reset_handle((int)ev.data); | 1358 | reset_handle((int)ev.data); |
1359 | break; | 1359 | break; |
1360 | 1360 | ||
1361 | case Q_CLOSE_HANDLE: | 1361 | case Q_CLOSE_HANDLE: |
1362 | LOGFQUEUE("buffering < Q_CLOSE_HANDLE"); | 1362 | LOGFQUEUE("buffering < Q_CLOSE_HANDLE %d", (int)ev.data); |
1363 | queue_reply(&buffering_queue, close_handle((int)ev.data)); | 1363 | queue_reply(&buffering_queue, close_handle((int)ev.data)); |
1364 | break; | 1364 | break; |
1365 | 1365 | ||
@@ -1370,7 +1370,7 @@ void buffering_thread(void) | |||
1370 | break; | 1370 | break; |
1371 | 1371 | ||
1372 | case Q_BASE_HANDLE: | 1372 | case Q_BASE_HANDLE: |
1373 | LOGFQUEUE("buffering < Q_BASE_HANDLE"); | 1373 | LOGFQUEUE("buffering < Q_BASE_HANDLE %d", (int)ev.data); |
1374 | base_handle_id = (int)ev.data; | 1374 | base_handle_id = (int)ev.data; |
1375 | break; | 1375 | break; |
1376 | 1376 | ||