diff src/madplug/plugin.h @ 1432:e6eab0c725cd

Branch merge madness.
author Tony Vroon <chainsaw@gentoo.org>
date Fri, 10 Aug 2007 14:02:18 +0100
parents 4993976d7ed0
children 85788238cbf5
line wrap: on
line diff
--- a/src/madplug/plugin.h	Fri Aug 10 14:01:43 2007 +0100
+++ b/src/madplug/plugin.h	Fri Aug 10 14:02:18 2007 +0100
@@ -37,7 +37,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <audacious/plugin.h>
-#include <audacious/titlestring.h>
+#include <audacious/main.h>
 #include <audacious/util.h>
 #include <audacious/strings.h>
 #include <audacious/vfs.h>
@@ -74,7 +74,7 @@
     struct id3_tag *tag;
     struct id3_file *id3file;
     struct xing xing;
-    TitleInput *tuple;          /* audacious tuple data */
+    Tuple *tuple;          /* audacious tuple data */
     gchar *prev_title;           /* used to optimize set_info calls */
 
     /* replay parameters */