# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1193486712 18000
# Node ID a9b7b4145664fe753186bad8af6a6432dc396896
# Parent  faba4117b0d02d310af859a3c0d5b7e05656c5d7# Parent  15675ec4437404087948a0bdf29a61d5de022650
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 15675ec44374 -r a9b7b4145664 src/audacious/vfs.c
--- a/src/audacious/vfs.c	Sat Oct 27 13:33:58 2007 +0200
+++ b/src/audacious/vfs.c	Sat Oct 27 07:05:12 2007 -0500
@@ -475,9 +475,7 @@
     if(!file)
         return FALSE;
 
-    curpos = file->base->vfs_ftell_impl(file);
     size = file->base->vfs_fsize_impl(file);
-    file->base->vfs_fseek_impl(file, curpos, SEEK_SET);
 
     if(size == -1)
         return TRUE;
diff -r 15675ec44374 -r a9b7b4145664 src/audacious/vfs_buffered_file.c
--- a/src/audacious/vfs_buffered_file.c	Sat Oct 27 13:33:58 2007 +0200
+++ b/src/audacious/vfs_buffered_file.c	Sat Oct 27 07:05:12 2007 -0500
@@ -221,7 +221,7 @@
 
     handle = g_new0(VFSFile, 1);
     fd = g_new0(VFSBufferedFile, 1);
-    fd->mem = g_malloc0(40000);
+    fd->mem = g_malloc0(128000);
     fd->fd = vfs_fopen(uri, "rb");
 
     if (fd->fd == NULL)
@@ -233,7 +233,7 @@
 	return NULL;
     }
 
-    sz = vfs_fread(fd->mem, 1, 40000, fd->fd);
+    sz = vfs_fread(fd->mem, 1, 128000, fd->fd);
     vfs_rewind(fd->fd);
 
     if (!sz)