len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the bug where MPC files would be skipped by disabling the check of the requested size against the default filechunk size in prep_bufdata when the caller is bufread.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15528 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2007-11-08 13:28:13 +00:00
parent f87eb608a8
commit f56cb7e09f
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/buffering.c
View file

@ -974,7 +974,8 @@ int bufadvance(int handle_id, off_t offset)
* actual amount of data available for reading. This function explicitly * actual amount of data available for reading. This function explicitly
* does not check the validity of the input handle. It does do range checks * does not check the validity of the input handle. It does do range checks
* on size and returns a valid (and explicit) amount of data for reading */ * on size and returns a valid (and explicit) amount of data for reading */
static size_t prep_bufdata(const struct memory_handle *h, size_t size) static size_t prep_bufdata(const struct memory_handle *h, size_t size,
bool filechunk_limit)
{ {
size_t avail = RINGBUF_SUB(h->widx, h->ridx); size_t avail = RINGBUF_SUB(h->widx, h->ridx);
@ -985,7 +986,8 @@ static size_t prep_bufdata(const struct memory_handle *h, size_t size)
if (size == 0 || size > avail + h->filerem) if (size == 0 || size > avail + h->filerem)
size = avail + h->filerem; size = avail + h->filerem;
if (h->type == TYPE_PACKET_AUDIO && size > BUFFERING_DEFAULT_FILECHUNK) if (filechunk_limit &&
h->type == TYPE_PACKET_AUDIO && size > BUFFERING_DEFAULT_FILECHUNK)
{ {
logf("data request > filechunk"); logf("data request > filechunk");
/* If more than a filechunk is requested, provide no more than the /* If more than a filechunk is requested, provide no more than the
@ -1020,7 +1022,7 @@ ssize_t bufread(int handle_id, size_t size, void *dest)
if (!h) if (!h)
return ERR_HANDLE_NOT_FOUND; return ERR_HANDLE_NOT_FOUND;
size = prep_bufdata(h, size); size = prep_bufdata(h, size, false);
if (h->ridx + size > buffer_len) if (h->ridx + size > buffer_len)
{ {
@ -1052,7 +1054,7 @@ ssize_t bufgetdata(int handle_id, size_t size, void **data)
if (!h) if (!h)
return ERR_HANDLE_NOT_FOUND; return ERR_HANDLE_NOT_FOUND;
size = prep_bufdata(h, size); size = prep_bufdata(h, size, true);
if (h->ridx + size > buffer_len) if (h->ridx + size > buffer_len)
{ {