# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1191280803 -10800
# Node ID 6acf1bda788b4f9cad49a0d9141a1a324e1abca6
# Parent  6faf2562e5236e9b559bf843748cab17b76922c7
Removed some extraneous includes.

diff -r 6faf2562e523 -r 6acf1bda788b src/aac/libmp4.c
--- a/src/aac/libmp4.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/aac/libmp4.c	Tue Oct 02 02:20:03 2007 +0300
@@ -9,15 +9,11 @@
 #include <audacious/plugin.h>
 #include <audacious/output.h>
 #include <audacious/util.h>
-#include <audacious/vfs.h>
 #include <audacious/i18n.h>
 #include <audacious/strings.h>
 #include <audacious/main.h>
-#include <audacious/tuple.h>
-#include <audacious/tuple_formatter.h>
 
 #define MP4_VERSION VERSION
-
 #define SBR_DEC
 
 extern VFSFile *vfs_buffered_file_new_from_uri(gchar *uri);
diff -r 6faf2562e523 -r 6acf1bda788b src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/console/Audacious_Driver.cxx	Tue Oct 02 02:20:03 2007 +0300
@@ -12,8 +12,7 @@
 #include <audacious/i18n.h>
 #include <gtk/gtk.h>
 extern "C" {
-#include <audacious/tuple.h>
-#include <audacious/tuple_formatter.h>
+#include <audacious/plugin.h>
 #include <audacious/util.h>
 #include <audacious/output.h>
 #include <audacious/playlist.h>
diff -r 6faf2562e523 -r 6acf1bda788b src/curl/curl.c
--- a/src/curl/curl.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/curl/curl.c	Tue Oct 02 02:20:03 2007 +0300
@@ -18,7 +18,6 @@
 
 #include "config.h"
 
-#include <audacious/vfs.h>
 #include <audacious/plugin.h>
 #include <audacious/configdb.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/m3u/m3u.c
--- a/src/m3u/m3u.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/m3u/m3u.c	Tue Oct 02 02:20:03 2007 +0300
@@ -31,12 +31,11 @@
 #include <sys/stat.h>
 #include <sys/errno.h>
 
-#include <audacious/vfs.h>
+#include <audacious/plugin.h>
 #include <audacious/main.h>
 #include <audacious/util.h>
 #include <audacious/playlist.h>
 #include <audacious/playlist_container.h>
-#include <audacious/plugin.h>
 #include <audacious/strings.h>
 
 static void
diff -r 6faf2562e523 -r 6acf1bda788b src/musepack/libmpc.h
--- a/src/musepack/libmpc.h	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/musepack/libmpc.h	Tue Oct 02 02:20:03 2007 +0300
@@ -1,6 +1,8 @@
 #ifndef XMMS_MUSEPACK
 #define XMMS_MUSEPACK
 
+#include "config.h"
+
 //xmms headers
 extern "C"
 {
@@ -9,9 +11,7 @@
 #include <audacious/util.h>
 #include <audacious/configdb.h>
 #include <audacious/main.h>
-#include <audacious/vfs.h>
 #include <audacious/i18n.h>
-#include "../../config.h"
 }
 
 //stdlib headers
diff -r 6faf2562e523 -r 6acf1bda788b src/sexypsf/plugin.c
--- a/src/sexypsf/plugin.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/sexypsf/plugin.c	Tue Oct 02 02:20:03 2007 +0300
@@ -16,13 +16,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/plugin.h>
 #include <audacious/main.h>
-#include <audacious/tuple.h>
-#include <audacious/tuple_formatter.h>
 #include <audacious/util.h>
-#include <audacious/vfs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 6faf2562e523 -r 6acf1bda788b src/smb/smb.c
--- a/src/smb/smb.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/smb/smb.c	Tue Oct 02 02:20:03 2007 +0300
@@ -16,7 +16,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <audacious/vfs.h>
 #include <audacious/plugin.h>
 #include <stdio.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/libtimidity/common.c
--- a/src/timidity/libtimidity/common.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/libtimidity/common.c	Tue Oct 02 02:20:03 2007 +0300
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <audacious/vfs.h>
 #include <stdlib.h>
 #include <string.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/libtimidity/instrum.c
--- a/src/timidity/libtimidity/instrum.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/libtimidity/instrum.c	Tue Oct 02 02:20:03 2007 +0300
@@ -25,7 +25,6 @@
 
 #include <config.h>
 
-#include <audacious/vfs.h>
 #include <string.h>
 #include <stdlib.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/libtimidity/mix.c
--- a/src/timidity/libtimidity/mix.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/libtimidity/mix.c	Tue Oct 02 02:20:03 2007 +0300
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <audacious/vfs.h>
 #include <math.h>
 #include <stdlib.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/libtimidity/playmidi.c
--- a/src/timidity/libtimidity/playmidi.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/libtimidity/playmidi.c	Tue Oct 02 02:20:03 2007 +0300
@@ -23,7 +23,6 @@
 
 #include <config.h>
 
-#include <audacious/vfs.h>
 #include <stdlib.h>
 #include <string.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/libtimidity/readmidi.c
--- a/src/timidity/libtimidity/readmidi.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/libtimidity/readmidi.c	Tue Oct 02 02:20:03 2007 +0300
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <audacious/vfs.h>
 #include <stdlib.h>
 #include <string.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/libtimidity/resample.c
--- a/src/timidity/libtimidity/resample.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/libtimidity/resample.c	Tue Oct 02 02:20:03 2007 +0300
@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include <audacious/vfs.h>
 #include <math.h>
 #include <stdlib.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/libtimidity/tables.c
--- a/src/timidity/libtimidity/tables.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/libtimidity/tables.c	Tue Oct 02 02:20:03 2007 +0300
@@ -21,8 +21,6 @@
 
 #include <config.h>
 
-#include <audacious/vfs.h>
-
 #include "timidity.h"
 #include "tables.h"
 
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/libtimidity/timidity.c
--- a/src/timidity/libtimidity/timidity.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/libtimidity/timidity.c	Tue Oct 02 02:20:03 2007 +0300
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <audacious/vfs.h>
 #include <stdlib.h>
 #include <string.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/xmms-timidity.c
--- a/src/timidity/xmms-timidity.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/xmms-timidity.c	Tue Oct 02 02:20:03 2007 +0300
@@ -17,12 +17,11 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <audacious/util.h>
 #include <audacious/configdb.h>
 #include <audacious/main.h>
-#include <audacious/vfs.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <string.h>
diff -r 6faf2562e523 -r 6acf1bda788b src/timidity/xmms-timidity.h
--- a/src/timidity/xmms-timidity.h	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/timidity/xmms-timidity.h	Tue Oct 02 02:20:03 2007 +0300
@@ -21,20 +21,19 @@
 #define XMMS_TIMIDITY_H
 
 #include <audacious/plugin.h>
-#include <audacious/vfs.h>
 
 extern InputPlugin xmmstimid_ip;
 
 static void xmmstimid_init(void);
 static void xmmstimid_about(void);
 static void xmmstimid_configure(void);
-static int xmmstimid_is_our_fd( char * filename, VFSFile * fp );
+static int xmmstimid_is_our_fd(gchar * filename, VFSFile * fp );
 static void xmmstimid_play_file(InputPlayback * playback);
 static void xmmstimid_stop(InputPlayback * playback);
 static void xmmstimid_pause(InputPlayback * playback, short p);
 static void xmmstimid_seek(InputPlayback * playback, int time);
 static int xmmstimid_get_time(InputPlayback * playback);
 static void xmmstimid_cleanup(void);
-static void xmmstimid_get_song_info(char *filename, char **title, int *length);
+static void xmmstimid_get_song_info(gchar *filename, gchar **title, gint *length);
 
 #endif
diff -r 6faf2562e523 -r 6acf1bda788b src/tta/libtta.c
--- a/src/tta/libtta.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/tta/libtta.c	Tue Oct 02 02:20:03 2007 +0300
@@ -39,10 +39,9 @@
 #include <glib.h>
 #include <string.h>
 
+#include <audacious/plugin.h>
 #include <audacious/util.h>
-#include <audacious/plugin.h>
 #include <audacious/main.h>
-#include <audacious/vfs.h>
 #include <audacious/output.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>
diff -r 6faf2562e523 -r 6acf1bda788b src/voice_removal/voice_removal.c
--- a/src/voice_removal/voice_removal.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/voice_removal/voice_removal.c	Tue Oct 02 02:20:03 2007 +0300
@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  *
  */
+#include "config.h"
 
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
 
-#include "../../config.h"
 
 static int apply_effect (gpointer *d, gint length, AFormat afmt,
 			gint srate, gint nch);
diff -r 6faf2562e523 -r 6acf1bda788b src/vorbis/configure.c
--- a/src/vorbis/configure.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/vorbis/configure.c	Tue Oct 02 02:20:03 2007 +0300
@@ -7,9 +7,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <audacious/plugin.h>
 #include <audacious/configdb.h>
 #include <audacious/util.h>
-#include <audacious/plugin.h>
 #include <audacious/i18n.h>
 
 extern GMutex *vf_mutex;
diff -r 6faf2562e523 -r 6acf1bda788b src/vorbis/fileinfo.c
--- a/src/vorbis/fileinfo.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/vorbis/fileinfo.c	Tue Oct 02 02:20:03 2007 +0300
@@ -37,7 +37,6 @@
 
 #include <audacious/strings.h>
 #include <audacious/util.h>
-#include <audacious/vfs.h>
 #include <audacious/i18n.h>
 
 #include "vorbis.h"
diff -r 6faf2562e523 -r 6acf1bda788b src/vorbis/vcedit.c
--- a/src/vorbis/vcedit.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/vorbis/vcedit.c	Tue Oct 02 02:20:03 2007 +0300
@@ -17,7 +17,6 @@
 #include <vorbis/codec.h>
 
 #include "vcedit.h"
-#include <audacious/vfs.h>
 
 #define CHUNKSIZE 4096
 
diff -r 6faf2562e523 -r 6acf1bda788b src/wav/wav-sndfile.c
--- a/src/wav/wav-sndfile.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/wav/wav-sndfile.c	Tue Oct 02 02:20:03 2007 +0300
@@ -38,8 +38,6 @@
 #include <audacious/util.h>
 #include <audacious/i18n.h>
 #include <audacious/main.h>
-#include <audacious/tuple.h>
-#include <audacious/tuple_formatter.h>
 #include <audacious/output.h>
 #include "wav-sndfile.h"
 
@@ -498,14 +496,14 @@
 }
 
 static void
-file_seek (InputPlayback *playback, int time)
+file_seek (InputPlayback *playback, gint time)
 {
 	gulong millisecond = time * 1000;
 	file_mseek(playback, millisecond);
 }
 
 static void
-get_song_info (char *filename, char **title, int *length)
+get_song_info (gchar *filename, gchar **title, gint *length)
 {
 	(*length) = get_song_length(filename);
 	(*title) = get_title(filename);
diff -r 6faf2562e523 -r 6acf1bda788b src/wav/wav-sndfile.h
--- a/src/wav/wav-sndfile.h	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/wav/wav-sndfile.h	Tue Oct 02 02:20:03 2007 +0300
@@ -29,8 +29,8 @@
 static	int	is_our_file (char *filename);
 static	void 	play_start (InputPlayback *playback);
 static	void 	play_stop (InputPlayback *playback);
-static	void 	file_seek (InputPlayback *playback, int time);
-static	void 	get_song_info (char *filename, char **title, int *length);
+static	void 	file_seek (InputPlayback *playback, gint time);
+static	void 	get_song_info (gchar *filename, gchar **title, gint *length);
 static	Tuple*  get_song_tuple (gchar *filename);
 static  void    wav_about (void);
 static	void	play_pause (InputPlayback *playback, gshort p);
diff -r 6faf2562e523 -r 6acf1bda788b src/wav/wav.c
--- a/src/wav/wav.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/wav/wav.c	Tue Oct 02 02:20:03 2007 +0300
@@ -28,8 +28,6 @@
 
 #include <audacious/util.h>
 #include <audacious/main.h>
-#include <audacious/tuple.h>
-#include <audacious/tuple_formatter.h>
 #include <audacious/output.h>
 #include <audacious/i18n.h>
 
diff -r 6faf2562e523 -r 6acf1bda788b src/wav/wav.h
--- a/src/wav/wav.h	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/wav/wav.h	Tue Oct 02 02:20:03 2007 +0300
@@ -21,10 +21,7 @@
 #include "config.h"
 
 #include <glib.h>
-
 #include <sys/types.h>
-
-#include <audacious/vfs.h>
 #include <audacious/plugin.h>
 
 #define	WAVE_FORMAT_UNKNOWN		(0x0000)
diff -r 6faf2562e523 -r 6acf1bda788b src/wma/wma.c
--- a/src/wma/wma.c	Tue Oct 02 01:59:52 2007 +0300
+++ b/src/wma/wma.c	Tue Oct 02 02:20:03 2007 +0300
@@ -38,12 +38,9 @@
 #include <audacious/plugin.h>
 #include <audacious/output.h>
 #include <audacious/util.h>
-#include <audacious/vfs.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>
 #include <audacious/main.h>
-#include <audacious/tuple.h>
-#include <audacious/tuple_formatter.h>
 
 #include "avcodec.h"
 #include "avformat.h"