diff src/timidity/libtimidity/stream.c @ 2038:04155ce9e72e

Automated merge with file:/home/ccr/audacious/plugins

--- a/src/timidity/libtimidity/stream.c	Sat Oct 13 21:53:37 2007 +0300
+++ b/src/timidity/libtimidity/stream.c	Sat Oct 13 21:53:47 2007 +0300
@@ -22,7 +22,7 @@
 size_t
 stdio_istream_read (void *ctx, void *ptr, size_t size, size_t nmemb)
 {
-  return vfs_fread (ptr, size, nmemb, ((StdIOContext *) ctx)->fp);
+  return aud_vfs_fread (ptr, size, nmemb, ((StdIOContext *) ctx)->fp);
 }
 
 int
@@ -30,7 +30,7 @@
 {
   int ret = 0;
   if (((StdIOContext *) ctx)->autoclose)
-    ret = vfs_fclose (((StdIOContext *) ctx)->fp);
+    ret = aud_vfs_fclose (((StdIOContext *) ctx)->fp);
   free (ctx);
   return ret;
 }
@@ -101,7 +101,7 @@
 {
   VFSFile *fp;
 
-  fp = vfs_fopen (file, "rb");
+  fp = aud_vfs_fopen (file, "rb");
   if (fp == NULL)
     return NULL;