devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

SHould fix FS#8074, is more better regardless though

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15466 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Brandon Low 2007-11-05 03:11:58 +00:00
parent d02b5c744e
commit 47eb569b62
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/buffering.c
View file

@ -179,6 +179,8 @@ enum {
Q_SET_WATERMARK, Q_SET_WATERMARK,
Q_SET_CHUNKSIZE, Q_SET_CHUNKSIZE,
Q_SET_PRESEEK, Q_SET_PRESEEK,
Q_FILL_BUFFER, /* Request that the buffering thread initiate a buffer
fill at its earliest convenience */
}; };
/* Buffering thread */ /* Buffering thread */
@ -1083,6 +1085,9 @@ ssize_t buf_handle_offset(int handle_id)
void buf_request_buffer_handle(int handle_id) void buf_request_buffer_handle(int handle_id)
{ {
LOGFQUEUE("buffering >| buffering Q_FILL_BUFFER");
queue_send(&buffering_queue, Q_FILL_BUFFER, 0);
LOGFQUEUE("buffering >| buffering Q_BUFFER_HANDLE %d", handle_id); LOGFQUEUE("buffering >| buffering Q_BUFFER_HANDLE %d", handle_id);
queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id); queue_send(&buffering_queue, Q_BUFFER_HANDLE, handle_id);
} }
@ -1190,14 +1195,19 @@ void buffering_thread(void)
switch (ev.id) switch (ev.id)
{ {
case Q_BUFFER_HANDLE: case Q_FILL_BUFFER:
LOGFQUEUE("buffering < Q_BUFFER_HANDLE"); LOGFQUEUE("buffering < Q_FILL_BUFFER");
queue_reply(&buffering_queue, 1);
/* Call buffer callbacks here because this is one of two ways /* Call buffer callbacks here because this is one of two ways
* to begin a full buffer fill */ * to begin a full buffer fill */
call_buffer_low_callbacks(); call_buffer_low_callbacks();
buffer_handle((int)ev.data); shrink_buffer(first_handle);
filling = true; filling = true;
queue_reply(&buffering_queue, 1);
break;
case Q_BUFFER_HANDLE:
LOGFQUEUE("buffering < Q_BUFFER_HANDLE");
queue_reply(&buffering_queue, 1);
buffer_handle((int)ev.data);
break; break;
case Q_RESET_HANDLE: case Q_RESET_HANDLE:
@ -1292,8 +1302,10 @@ void buffering_thread(void)
else if (ev.id == SYS_TIMEOUT) else if (ev.id == SYS_TIMEOUT)
{ {
if (data_counters.remaining > 0 && if (data_counters.remaining > 0 &&
data_counters.useful <= conf_watermark) data_counters.useful <= conf_watermark) {
shrink_buffer(first_handle);
filling = fill_buffer(); filling = fill_buffer();
}
} }
} }
} }