# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1186191582 18000
# Node ID 2453bf125b4ff2aa9c42ec663d1470f7b3e730ca
# Parent  06baa146fc1dbf076f03265c4402fbbee4b35edc# Parent  cfb76302b46807171412e0ae13551db29c3a9af1
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r cfb76302b468 -r 2453bf125b4f src/audacious/plugin.h
--- a/src/audacious/plugin.h	Fri Aug 03 22:51:04 2007 +0200
+++ b/src/audacious/plugin.h	Fri Aug 03 20:39:42 2007 -0500
@@ -51,7 +51,7 @@
 #define LOWLEVEL_PLUGIN(x) ((LowlevelPlugin *)(x))
 
 #define __AUDACIOUS_NEWVFS__
-#define __AUDACIOUS_PLUGIN_API__ 3
+#define __AUDACIOUS_PLUGIN_API__ 4
 #define __AUDACIOUS_INPUT_PLUGIN_API__ 4
 
 typedef enum {
diff -r cfb76302b468 -r 2453bf125b4f src/audacious/pluginenum.c
--- a/src/audacious/pluginenum.c	Fri Aug 03 22:51:04 2007 +0200
+++ b/src/audacious/pluginenum.c	Fri Aug 03 20:39:42 2007 -0500
@@ -250,11 +250,9 @@
     if (header->magic != PLUGIN_MAGIC)
         return plugin2_dispose(module, "plugin <%s> discarded, invalid module magic", filename);
 
-#if 0
     if (header->api_version != __AUDACIOUS_PLUGIN_API__)
         return plugin2_dispose(module, "plugin <%s> discarded, wanting API version %d, we implement API version %d",
                                filename, header->api_version, __AUDACIOUS_PLUGIN_API__);
-#endif
 
     if (header->init)
         header->init();