# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1191736408 18000
# Node ID 6e2070ea35e72d1a02d458ee7d78515ff4b282ad
# Parent  839804c3b3a4713efd1ddac3c34c93bd4c58bb29
more work

diff -r 839804c3b3a4 -r 6e2070ea35e7 src/modplug/archive/arch_raw.h
--- a/src/modplug/archive/arch_raw.h	Sun Oct 07 00:43:10 2007 -0500
+++ b/src/modplug/archive/arch_raw.h	Sun Oct 07 00:53:28 2007 -0500
@@ -11,7 +11,7 @@
 #include <string>
 
 extern "C" {
-#include <audacious/vfs.h>
+#include <audacious/plugin.h>
 };
 
 class arch_Raw: public Archive
diff -r 839804c3b3a4 -r 6e2070ea35e7 src/paranormal/libcalc/parser.h
--- a/src/paranormal/libcalc/parser.h	Sun Oct 07 00:43:10 2007 -0500
+++ b/src/paranormal/libcalc/parser.h	Sun Oct 07 00:53:28 2007 -0500
@@ -24,8 +24,8 @@
 
 #include <glib.h>
 #include <stdio.h>
-#include <audacious/vfs.h>
-#include <audacious/aud_vfs_buffer.h>
+#include <audacious/plugin.h>
+#include <audacious/vfs_buffer.h>
 
 #include "execute.h"
 
diff -r 839804c3b3a4 -r 6e2070ea35e7 src/stdio/stdio.c
--- a/src/stdio/stdio.c	Sun Oct 07 00:43:10 2007 -0500
+++ b/src/stdio/stdio.c	Sun Oct 07 00:53:28 2007 -0500
@@ -251,18 +251,18 @@
 
 VFSConstructor file_const = {
 	.uri_id = "file://",
-	.aud_vfs_fopen_impl = stdio_aud_vfs_fopen_impl,
-	.aud_vfs_fclose_impl = stdio_aud_vfs_fclose_impl,
-	.aud_vfs_fread_impl = stdio_aud_vfs_fread_impl,
-	.aud_vfs_fwrite_impl = stdio_aud_vfs_fwrite_impl,
-	.aud_vfs_getc_impl = stdio_aud_vfs_getc_impl,
-	.aud_vfs_ungetc_impl = stdio_aud_vfs_ungetc_impl,
-	.aud_vfs_fseek_impl = stdio_aud_vfs_fseek_impl,
-	.aud_vfs_rewind_impl = stdio_aud_vfs_rewind_impl,
-	.aud_vfs_ftell_impl = stdio_aud_vfs_ftell_impl,
-	.aud_vfs_feof_impl = stdio_aud_vfs_feof_impl,
-	.aud_vfs_truncate_impl = stdio_aud_vfs_truncate_impl,
-	.aud_vfs_fsize_impl = stdio_aud_vfs_fsize_impl
+	.vfs_fopen_impl = stdio_aud_vfs_fopen_impl,
+	.vfs_fclose_impl = stdio_aud_vfs_fclose_impl,
+	.vfs_fread_impl = stdio_aud_vfs_fread_impl,
+	.vfs_fwrite_impl = stdio_aud_vfs_fwrite_impl,
+	.vfs_getc_impl = stdio_aud_vfs_getc_impl,
+	.vfs_ungetc_impl = stdio_aud_vfs_ungetc_impl,
+	.vfs_fseek_impl = stdio_aud_vfs_fseek_impl,
+	.vfs_rewind_impl = stdio_aud_vfs_rewind_impl,
+	.vfs_ftell_impl = stdio_aud_vfs_ftell_impl,
+	.vfs_feof_impl = stdio_aud_vfs_feof_impl,
+	.vfs_truncate_impl = stdio_aud_vfs_truncate_impl,
+	.vfs_fsize_impl = stdio_aud_vfs_fsize_impl
 };
 
 static void init(void)
diff -r 839804c3b3a4 -r 6e2070ea35e7 src/timidity/libtimidity/timidity.h
--- a/src/timidity/libtimidity/timidity.h	Sun Oct 07 00:43:10 2007 -0500
+++ b/src/timidity/libtimidity/timidity.h	Sun Oct 07 00:53:28 2007 -0500
@@ -23,7 +23,7 @@
 #ifndef TIMIDITY_H
 #define TIMIDITY_H
 
-#include <audacious/vfs.h>
+#include <audacious/plugin.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff -r 839804c3b3a4 -r 6e2070ea35e7 src/tta/ttalib.h
--- a/src/tta/ttalib.h	Sun Oct 07 00:43:10 2007 -0500
+++ b/src/tta/ttalib.h	Sun Oct 07 00:53:28 2007 -0500
@@ -30,7 +30,7 @@
 #ifndef TTALIB_H_
 #define TTALIB_H_
 
-#include <audacious/vfs.h>
+#include <audacious/plugin.h>
 
 // audacious support
 #define FILE	VFSFile
diff -r 839804c3b3a4 -r 6e2070ea35e7 src/wma/libffwma/file.c
--- a/src/wma/libffwma/file.c	Sun Oct 07 00:43:10 2007 -0500
+++ b/src/wma/libffwma/file.c	Sun Oct 07 00:53:28 2007 -0500
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <audacious/vfs.h>
+#include <audacious/plugin.h>
 
 /* standard file protocol */