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

Roll back unintentionally submitted file.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29200 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2011-02-03 08:36:34 +00:00
parent 7345ac124e
commit 6b476e7bec
1 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
apps/buffering.c
View file

@ -25,8 +25,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
#include <inttypes.h> #include <inttypes.h>
#define assert(a)
#include "buffering.h" #include "buffering.h"
#include "storage.h" #include "storage.h"
@ -613,16 +611,6 @@ static inline bool buffer_is_low(void)
return data_counters.useful < (conf_watermark / 2); return data_counters.useful < (conf_watermark / 2);
} }
static uintptr_t beyond_handle(struct memory_handle *h)
{
/*
* the last handle on the chain must leave at least one byte
* between itself and the first handle, to avoid overflowing the
* ring by advancing buf_widx up to buf_ridx
*/
return h->next != 0 ? ringbuf_offset(h->next) : ringbuf_sub(buf_ridx, 1);
}
/* Buffer data for the given handle. /* Buffer data for the given handle.
Return whether or not the buffering should continue explicitly. */ Return whether or not the buffering should continue explicitly. */
static bool buffer_handle(int handle_id) static bool buffer_handle(int handle_id)
@ -681,10 +669,10 @@ static bool buffer_handle(int handle_id)
buffer_len - h->widx); buffer_len - h->widx);
ssize_t overlap; ssize_t overlap;
uintptr_t next_handle = beyond_handle(h); uintptr_t next_handle = ringbuf_offset(h->next);
/* stop copying if it would overwrite the reading position */ /* stop copying if it would overwrite the reading position */
if (h->widx == next_handle || ringbuf_add_cross(h->widx, copy_n, buf_ridx) >= 0) if (ringbuf_add_cross(h->widx, copy_n, buf_ridx) >= 0)
return false; return false;
/* FIXME: This would overwrite the next handle /* FIXME: This would overwrite the next handle
@ -801,7 +789,8 @@ static void rebuffer_handle(int handle_id, size_t newpos)
LOGFQUEUE("buffering >| Q_RESET_HANDLE %d", handle_id); LOGFQUEUE("buffering >| Q_RESET_HANDLE %d", handle_id);
queue_send(&buffering_queue, Q_RESET_HANDLE, handle_id); queue_send(&buffering_queue, Q_RESET_HANDLE, handle_id);
if (ringbuf_sub(beyond_handle(h), h->data) < h->filesize - newpos) uintptr_t next = ringbuf_offset(h->next);
if (ringbuf_sub(next, h->data) < h->filesize - newpos)
{ {
/* There isn't enough space to rebuffer all of the track from its new /* There isn't enough space to rebuffer all of the track from its new
offset, so we ask the user to free some */ offset, so we ask the user to free some */