Mercurial > audlegacy
changeset 2382:d41965d1806a trunk
[svn] - in vfs_buffered_file, we should only switch to live FD after 32768,
not AT 32768.
| author | nenolod |
|---|---|
| date | Mon, 22 Jan 2007 01:01:33 -0800 |
| parents | d49913587458 |
| children | 986e96fbdba3 |
| files | ChangeLog src/audacious/vfs_buffered_file.c |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 21 20:45:17 2007 -0800 +++ b/ChangeLog Mon Jan 22 01:01:33 2007 -0800 @@ -1,3 +1,12 @@ +2007-01-22 04:45:17 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [3772] + - changes to the nature of URI handling in the VFS subsystem, will be + chased momentarily in plugins. + + trunk/src/audacious/vfs.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + + 2007-01-21 15:11:08 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [3770] - handle empty playlists gracefully
--- a/src/audacious/vfs_buffered_file.c Sun Jan 21 20:45:17 2007 -0800 +++ b/src/audacious/vfs_buffered_file.c Mon Jan 22 01:01:33 2007 -0800 @@ -58,7 +58,7 @@ /* is this request within the buffered area, or should we switch to * an FD? --nenolod */ - if ((vfs_ftell(handle->buffer)) + (size * nmemb) >= + if ((vfs_ftell(handle->buffer)) + (size * nmemb) > ((VFSBuffer *) handle->buffer->handle)->size) handle->which = TRUE; @@ -84,7 +84,7 @@ /* is this request within the buffered area, or should we switch to * an FD? --nenolod */ - if ((vfs_ftell(handle->buffer)) + 1 >= + if ((vfs_ftell(handle->buffer)) + 1 > ((VFSBuffer *) handle->buffer->handle)->size) handle->which = TRUE;