# HG changeset patch
# User Cristi Magherusan <majeru@atheme-project.org>
# Date 1186114896 -10800
# Node ID 761e17b23e0c2861a8949bda55cb4d55474296ec
# Parent  2e25c7a29ac2b06f41743148b4fb05f632b2fd92
added Discovery plugin type

diff -r 2e25c7a29ac2 -r 761e17b23e0c src/CoreAudio/coreaudio.c
--- a/src/CoreAudio/coreaudio.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/CoreAudio/coreaudio.c	Fri Aug 03 07:21:36 2007 +0300
@@ -46,4 +46,4 @@
 
 OutputPlugin *coreaudio_oplist[] = { &osx_op, NULL };
 
-DECLARE_PLUGIN(coreaudio, NULL, NULL, NULL, coreaudio_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(coreaudio, NULL, NULL, NULL, coreaudio_oplist, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/OSS/OSS.c
--- a/src/OSS/OSS.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/OSS/OSS.c	Fri Aug 03 07:21:36 2007 +0300
@@ -49,7 +49,7 @@
 
 OutputPlugin *oss_oplist[] = { &oss_op, NULL };
 
-DECLARE_PLUGIN(OSS, NULL, NULL, NULL, oss_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(OSS, NULL, NULL, NULL, oss_oplist, NULL, NULL, NULL, NULL);
 
 void oss_cleanup(void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/OSS4/OSS4.c
--- a/src/OSS4/OSS4.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/OSS4/OSS4.c	Fri Aug 03 07:21:36 2007 +0300
@@ -50,7 +50,7 @@
 
 OutputPlugin *oss_oplist[] = { &oss_op, NULL };
 
-DECLARE_PLUGIN(OSS4, NULL, NULL, NULL, oss_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(OSS4, NULL, NULL, NULL, oss_oplist, NULL, NULL, NULL, NULL);
 
 void oss_cleanup(void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/aac/src/libmp4.c
--- a/src/aac/src/libmp4.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/aac/src/libmp4.c	Fri Aug 03 07:21:36 2007 +0300
@@ -69,7 +69,7 @@
 
 InputPlugin *mp4_iplist[] = { &mp4_ip, NULL };
 
-DECLARE_PLUGIN(mp4, NULL, NULL, mp4_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(mp4, NULL, NULL, mp4_iplist, NULL, NULL, NULL, NULL, NULL);
 
 typedef struct  _mp4cfg
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/adplug/adplug-xmms.cc
--- a/src/adplug/adplug-xmms.cc	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/adplug/adplug-xmms.cc	Fri Aug 03 07:21:36 2007 +0300
@@ -1148,4 +1148,4 @@
 
 InputPlugin *adplug_iplist[] = { &adplug_ip, NULL };
 
-DECLARE_PLUGIN(adplug, NULL, NULL, adplug_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(adplug, NULL, NULL, adplug_iplist, NULL, NULL, NULL, NULL,NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/alac/plugin.c
--- a/src/alac/plugin.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/alac/plugin.c	Fri Aug 03 07:21:36 2007 +0300
@@ -305,7 +305,7 @@
 
 InputPlugin *alac_iplist[] = { &alac_ip, NULL };
 
-DECLARE_PLUGIN(alac, NULL, NULL, alac_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(alac, NULL, NULL, alac_iplist, NULL, NULL, NULL, NULL, NULL);
 
 gpointer decode_thread(void *args)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/alarm/alarm.c
--- a/src/alarm/alarm.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/alarm/alarm.c	Fri Aug 03 07:21:36 2007 +0300
@@ -1006,7 +1006,7 @@
 };
 
 GeneralPlugin *alarm_gplist[] = { &alarm_plugin, NULL };
-DECLARE_PLUGIN(alarm, NULL, NULL, NULL, NULL, NULL, alarm_gplist, NULL);
+DECLARE_PLUGIN(alarm, NULL, NULL, NULL, NULL, NULL, alarm_gplist, NULL, NULL);
 
 /*
  * vi:ai:expandtab:ts=2 sts=2 shiftwidth=2:nowrap:
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/alsa/alsa.c
--- a/src/alsa/alsa.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/alsa/alsa.c	Fri Aug 03 07:21:36 2007 +0300
@@ -44,7 +44,7 @@
 
 OutputPlugin *alsa_oplist[] = { &alsa_op, NULL };
 
-DECLARE_PLUGIN(alsa, NULL, NULL, NULL, alsa_oplist, NULL, NULL, NULL)
+DECLARE_PLUGIN(alsa, NULL, NULL, NULL, alsa_oplist, NULL, NULL, NULL, NULL)
 
 void alsa_cleanup(void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/amidi-plug/amidi-plug.c
--- a/src/amidi-plug/amidi-plug.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/amidi-plug/amidi-plug.c	Fri Aug 03 07:21:36 2007 +0300
@@ -22,7 +22,7 @@
 
 InputPlugin *amidiplug_iplist[] = { &amidiplug_ip, NULL };
 
-DECLARE_PLUGIN(amidi-plug, NULL, NULL, amidiplug_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(amidi-plug, NULL, NULL, amidiplug_iplist, NULL, NULL, NULL, NULL, NULL);
 
 static gboolean amidiplug_detect_by_content( gchar * filename_uri , VFSFile * fp )
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/aosd/aosd.c
--- a/src/aosd/aosd.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/aosd/aosd.c	Fri Aug 03 07:21:36 2007 +0300
@@ -26,7 +26,7 @@
 
 
 GeneralPlugin *aosd_gplist[] = { &aosd_gp, NULL };
-DECLARE_PLUGIN(aosd, NULL, NULL, NULL, NULL, NULL, aosd_gplist, NULL);
+DECLARE_PLUGIN(aosd, NULL, NULL, NULL, NULL, NULL, aosd_gplist, NULL, NULL);
 
 aosd_cfg_t * global_config = NULL;
 gboolean plugin_is_active = FALSE;
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/arts/arts.c
--- a/src/arts/arts.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/arts/arts.c	Fri Aug 03 07:21:36 2007 +0300
@@ -55,4 +55,4 @@
 
 OutputPlugin *arts_oplist[] = { &arts_op, NULL };
 
-DECLARE_PLUGIN(arts, NULL, NULL, NULL, arts_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(arts, NULL, NULL, NULL, arts_oplist, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/audiocompress/audacious-glue.c
--- a/src/audiocompress/audacious-glue.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/audiocompress/audacious-glue.c	Fri Aug 03 07:21:36 2007 +0300
@@ -57,7 +57,7 @@
 
 EffectPlugin *audiocompress_eplist[] = { &xmms_plugin, NULL };
 
-DECLARE_PLUGIN(audiocompress, NULL, NULL, NULL, NULL, audiocompress_eplist, NULL, NULL);
+DECLARE_PLUGIN(audiocompress, NULL, NULL, NULL, NULL, audiocompress_eplist, NULL, NULL, NULL);
 
 void myInit(void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/blur_scope/blur_scope.c
--- a/src/blur_scope/blur_scope.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/blur_scope/blur_scope.c	Fri Aug 03 07:21:36 2007 +0300
@@ -84,7 +84,7 @@
 
 VisPlugin *bscope_vplist[] = { &bscope_vp, NULL };
 
-DECLARE_PLUGIN(bscope, NULL, NULL, NULL, NULL, NULL, NULL, bscope_vplist);
+DECLARE_PLUGIN(bscope, NULL, NULL, NULL, NULL, NULL, NULL, bscope_vplist,NULL);
 
 #define WIDTH 256
 #define HEIGHT 128
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/cdaudio-ng/cdaudio-ng.c
--- a/src/cdaudio-ng/cdaudio-ng.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/cdaudio-ng/cdaudio-ng.c	Fri Aug 03 07:21:36 2007 +0300
@@ -98,7 +98,7 @@
 
 InputPlugin *cdaudio_iplist[] = { &inputplugin, NULL };
 
-DECLARE_PLUGIN(cdaudio, NULL, NULL, cdaudio_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(cdaudio, NULL, NULL, cdaudio_iplist, NULL, NULL, NULL, NULL, NULL);
 
 
 void cdaudio_init()
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/console/Audacious_Driver.cxx	Fri Aug 03 07:21:36 2007 +0300
@@ -532,6 +532,6 @@
 
 extern "C" {
 
-DECLARE_PLUGIN(console, NULL, NULL, console_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(console, NULL, NULL, console_iplist, NULL, NULL, NULL, NULL,NULL);
 
 };
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/cue/cuesheet.c
--- a/src/cue/cuesheet.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/cue/cuesheet.c	Fri Aug 03 07:21:36 2007 +0300
@@ -124,7 +124,7 @@
 
 InputPlugin *cue_iplist[] = { &cue_ip, NULL };
 
-DECLARE_PLUGIN(cue, NULL, NULL, cue_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(cue, NULL, NULL, cue_iplist, NULL, NULL, NULL, NULL, NULL);
 
 static void cue_init(void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/curl/curl.c
--- a/src/curl/curl.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/curl/curl.c	Fri Aug 03 07:21:36 2007 +0300
@@ -1091,4 +1091,4 @@
 #endif
 }
 
-DECLARE_PLUGIN(curl, init, cleanup, NULL, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(curl, init, cleanup, NULL, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/echo_plugin/echo.c
--- a/src/echo_plugin/echo.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/echo_plugin/echo.c	Fri Aug 03 07:21:36 2007 +0300
@@ -41,7 +41,7 @@
 
 EffectPlugin *echo_eplist[] = { &echo_ep, NULL };
 
-DECLARE_PLUGIN(echo, NULL, NULL, NULL, NULL, echo_eplist, NULL, NULL);
+DECLARE_PLUGIN(echo, NULL, NULL, NULL, NULL, echo_eplist, NULL, NULL, NULL);
 
 static void init(void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/esd/esd.c
--- a/src/esd/esd.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/esd/esd.c	Fri Aug 03 07:21:36 2007 +0300
@@ -44,4 +44,4 @@
 
 OutputPlugin *esd_oplist[] = { &esd_op, NULL };
 
-DECLARE_PLUGIN(esd, NULL, NULL, NULL, esd_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(esd, NULL, NULL, NULL, esd_oplist, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/evdev-plug/ed.c
--- a/src/evdev-plug/ed.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/evdev-plug/ed.c	Fri Aug 03 07:21:36 2007 +0300
@@ -29,7 +29,7 @@
 
 
 GeneralPlugin *evdevplug_gplist[] = { &ed_gp, NULL };
-DECLARE_PLUGIN(evdev-plug, NULL, NULL, NULL, NULL, NULL, evdevplug_gplist, NULL);
+DECLARE_PLUGIN(evdev-plug, NULL, NULL, NULL, NULL, NULL, evdevplug_gplist, NULL, NULL);
 
 GList *ed_device_listening_list = NULL;
 gboolean plugin_is_active = FALSE;
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/filewriter/filewriter.c
--- a/src/filewriter/filewriter.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/filewriter/filewriter.c	Fri Aug 03 07:21:36 2007 +0300
@@ -113,7 +113,7 @@
 
 OutputPlugin *file_oplist[] = { &file_op, NULL };
 
-DECLARE_PLUGIN(filewriter, NULL, NULL, NULL, file_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(filewriter, NULL, NULL, NULL, file_oplist, NULL, NULL, NULL, NULL);
 
 static void set_plugin(void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/flacng/plugin.c
--- a/src/flacng/plugin.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/flacng/plugin.c	Fri Aug 03 07:21:36 2007 +0300
@@ -63,7 +63,7 @@
 
 InputPlugin *flac_iplist[] = { &flac_ip, NULL };
 
-DECLARE_PLUGIN(flacng, NULL, NULL, flac_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(flacng, NULL, NULL, flac_iplist, NULL, NULL, NULL, NULL, NULL);
 
 FLAC__StreamDecoder* test_decoder;
 FLAC__StreamDecoder* main_decoder;
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/jack/jack.c
--- a/src/jack/jack.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/jack/jack.c	Fri Aug 03 07:21:36 2007 +0300
@@ -638,4 +638,4 @@
 
 OutputPlugin *jack_oplist[] = { &jack_op, NULL };
 
-DECLARE_PLUGIN(jack, NULL, NULL, NULL, jack_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(jack, NULL, NULL, NULL, jack_oplist, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/ladspa/ladspa.c
--- a/src/ladspa/ladspa.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/ladspa/ladspa.c	Fri Aug 03 07:21:36 2007 +0300
@@ -129,7 +129,7 @@
 
 EffectPlugin *ladspa_eplist[] = { &ladspa_ep, NULL };
 
-DECLARE_PLUGIN(ladspa, NULL, NULL, NULL, NULL, ladspa_eplist, NULL, NULL);
+DECLARE_PLUGIN(ladspa, NULL, NULL, NULL, NULL, ladspa_eplist, NULL, NULL, NULL);
 
 static void start (void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/lastfm/lastfm.c
--- a/src/lastfm/lastfm.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/lastfm/lastfm.c	Fri Aug 03 07:21:36 2007 +0300
@@ -594,4 +594,4 @@
 #endif
 }
 
-DECLARE_PLUGIN(lastfm, init, cleanup, NULL, NULL, NULL, NULL, NULL)
+DECLARE_PLUGIN(lastfm, init, cleanup, NULL, NULL, NULL, NULL, NULL, NULL)
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/lirc/lirc.c
--- a/src/lirc/lirc.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/lirc/lirc.c	Fri Aug 03 07:21:36 2007 +0300
@@ -61,7 +61,7 @@
 };
 
 GeneralPlugin *lirc_gplist[] = { &lirc_plugin, NULL };
-DECLARE_PLUGIN(lirc, NULL, NULL, NULL, NULL, NULL, lirc_gplist, NULL);
+DECLARE_PLUGIN(lirc, NULL, NULL, NULL, NULL, NULL, lirc_gplist, NULL, NULL);
 
 int lirc_fd=-1;
 struct lirc_config *config=NULL;
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/m3u/m3u.c
--- a/src/m3u/m3u.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/m3u/m3u.c	Fri Aug 03 07:21:36 2007 +0300
@@ -220,4 +220,4 @@
 	playlist_container_unregister(&plc_m3u);
 }
 
-DECLARE_PLUGIN(m3u, init, cleanup, NULL, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(m3u, init, cleanup, NULL, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/madplug/plugin.c
--- a/src/madplug/plugin.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/madplug/plugin.c	Fri Aug 03 07:21:36 2007 +0300
@@ -837,6 +837,6 @@
 
 InputPlugin *madplug_iplist[] = { &mad_ip, NULL };
 
-DECLARE_PLUGIN(madplug, NULL, NULL, madplug_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(madplug, NULL, NULL, madplug_iplist, NULL, NULL, NULL, NULL, NULL);
 
 InputPlugin *mad_plugin = &mad_ip;
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/metronom/metronom.c
--- a/src/metronom/metronom.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/metronom/metronom.c	Fri Aug 03 07:21:36 2007 +0300
@@ -296,4 +296,4 @@
 
 InputPlugin *metronom_iplist[] = { &metronom_ip, NULL };
 
-DECLARE_PLUGIN(metronom, NULL, NULL, metronom_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(metronom, NULL, NULL, metronom_iplist, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/mms/mms.c
--- a/src/mms/mms.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/mms/mms.c	Fri Aug 03 07:21:36 2007 +0300
@@ -231,4 +231,4 @@
 #endif
 }
 
-DECLARE_PLUGIN(mms, init, cleanup, NULL, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(mms, init, cleanup, NULL, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/modplug/plugin.cxx
--- a/src/modplug/plugin.cxx	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/modplug/plugin.cxx	Fri Aug 03 07:21:36 2007 +0300
@@ -115,4 +115,4 @@
 
 InputPlugin *modplug_iplist[] = { &gModPlug, NULL };
 
-DECLARE_PLUGIN(modplug, NULL, NULL, modplug_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(modplug, NULL, NULL, modplug_iplist, NULL, NULL, NULL, NULL,NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/musepack/libmpc.cxx
--- a/src/musepack/libmpc.cxx	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/musepack/libmpc.cxx	Fri Aug 03 07:21:36 2007 +0300
@@ -44,7 +44,7 @@
 
 InputPlugin *mpc_iplist[] = { &MpcPlugin, NULL };
 
-DECLARE_PLUGIN(musepack, NULL, NULL, mpc_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(musepack, NULL, NULL, mpc_iplist, NULL, NULL, NULL, NULL,NULL);
 
 static PluginConfig pluginConfig = {0};
 static Widgets      widgets      = {0};
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/null/null.c
--- a/src/null/null.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/null/null.c	Fri Aug 03 07:21:36 2007 +0300
@@ -263,4 +263,4 @@
 
 OutputPlugin *null_oplist[] = { &null_op, NULL };
 
-DECLARE_PLUGIN(null, NULL, NULL, NULL, null_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(null, NULL, NULL, NULL, null_oplist, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/paranormal/plugin.c
--- a/src/paranormal/plugin.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/paranormal/plugin.c	Fri Aug 03 07:21:36 2007 +0300
@@ -78,7 +78,7 @@
 
 VisPlugin *pn_vplist[] = { &pn_vp, NULL };
 
-DECLARE_PLUGIN(paranormal, NULL, NULL, NULL, NULL, NULL, NULL, pn_vplist);
+DECLARE_PLUGIN(paranormal, NULL, NULL, NULL, NULL, NULL, NULL, pn_vplist,NULL);
 
 static void
 load_pn_rc (void)
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/pls/pls.c
--- a/src/pls/pls.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/pls/pls.c	Fri Aug 03 07:21:36 2007 +0300
@@ -134,4 +134,4 @@
     playlist_container_unregister(&plc_pls);
 }
 
-DECLARE_PLUGIN(pls, init, cleanup, NULL, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(pls, init, cleanup, NULL, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/projectm/main.c
--- a/src/projectm/main.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/projectm/main.c	Fri Aug 03 07:21:36 2007 +0300
@@ -91,7 +91,7 @@
 
 VisPlugin *projectM_vplist[] = { &projectM_vtable, NULL };
 
-DECLARE_PLUGIN(projectm, NULL, NULL, NULL, NULL, NULL, NULL, projectM_vplist);
+DECLARE_PLUGIN(projectm, NULL, NULL, NULL, NULL, NULL, NULL, projectM_vplist,NULL);
 
 // Our worker thread
 SDL_Thread *worker_thread;
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/pulse_audio/pulse_audio.c
--- a/src/pulse_audio/pulse_audio.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/pulse_audio/pulse_audio.c	Fri Aug 03 07:21:36 2007 +0300
@@ -727,4 +727,4 @@
 
 OutputPlugin *pulse_oplist[] = { &pulse_op, NULL };
 
-DECLARE_PLUGIN(pulse, NULL, NULL, NULL, pulse_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(pulse, NULL, NULL, NULL, pulse_oplist, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/rocklight/rocklight.c
--- a/src/rocklight/rocklight.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/rocklight/rocklight.c	Fri Aug 03 07:21:36 2007 +0300
@@ -128,4 +128,4 @@
 
 VisPlugin *rocklight_vplist[] = { &rocklight_vp, NULL };
 
-DECLARE_PLUGIN(rocklight, NULL, NULL, NULL, NULL, NULL, NULL, rocklight_vplist);
+DECLARE_PLUGIN(rocklight, NULL, NULL, NULL, NULL, NULL, NULL, rocklight_vplist,NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/rootvis/rootvis.c
--- a/src/rootvis/rootvis.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/rootvis/rootvis.c	Fri Aug 03 07:21:36 2007 +0300
@@ -44,7 +44,7 @@
 
 VisPlugin *rootvis_vplist[] = { &rootvis_vtable, NULL };
 
-DECLARE_PLUGIN(rootvis, NULL, NULL, NULL, NULL, NULL, NULL, rootvis_vplist);
+DECLARE_PLUGIN(rootvis, NULL, NULL, NULL, NULL, NULL, NULL, rootvis_vplist,NULL);
 
 // X related
 struct rootvis_x {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/rovascope/plugin.c
--- a/src/rovascope/plugin.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/rovascope/plugin.c	Fri Aug 03 07:21:36 2007 +0300
@@ -78,7 +78,7 @@
 
 VisPlugin *rovascope_vplist[] = { &pn_vp, NULL };
 
-DECLARE_PLUGIN(rovascope, NULL, NULL, NULL, NULL, NULL, NULL, rovascope_vplist);
+DECLARE_PLUGIN(rovascope, NULL, NULL, NULL, NULL, NULL, NULL, rovascope_vplist,NULL);
 
 static void
 load_pn_rc (void)
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/scrobbler/plugin.c
--- a/src/scrobbler/plugin.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/scrobbler/plugin.c	Fri Aug 03 07:21:36 2007 +0300
@@ -321,4 +321,4 @@
 
 GeneralPlugin *scrobbler_gplist[] = { &scrobbler_gp, NULL };
 
-DECLARE_PLUGIN(scrobbler, NULL, NULL, NULL, NULL, NULL, scrobbler_gplist, NULL);
+DECLARE_PLUGIN(scrobbler, NULL, NULL, NULL, NULL, NULL, scrobbler_gplist, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/sexypsf/plugin.c
--- a/src/sexypsf/plugin.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/sexypsf/plugin.c	Fri Aug 03 07:21:36 2007 +0300
@@ -288,4 +288,4 @@
 
 InputPlugin *sexypsf_iplist[] = { &sexypsf_ip, NULL };
 
-DECLARE_PLUGIN(sexypsf, NULL, NULL, sexypsf_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(sexypsf, NULL, NULL, sexypsf_iplist, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/shnplug/shn.c
--- a/src/shnplug/shn.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/shnplug/shn.c	Fri Aug 03 07:21:36 2007 +0300
@@ -80,7 +80,7 @@
 
 InputPlugin *shn_iplist[] = { &shn_ip, NULL };
 
-DECLARE_PLUGIN(shnplug, NULL, NULL, shn_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(shnplug, NULL, NULL, shn_iplist, NULL, NULL, NULL, NULL, NULL);
 
 shn_file *shnfile;
 shn_config shn_cfg;
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/sid/xs_init.c
--- a/src/sid/xs_init.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/sid/xs_init.c	Fri Aug 03 07:21:36 2007 +0300
@@ -60,4 +60,4 @@
 
 InputPlugin *sid_iplist[] = { &xs_plugin_ip, NULL };
 
-DECLARE_PLUGIN(sid, NULL, NULL, sid_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(sid, NULL, NULL, sid_iplist, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/sndstretch/sndstretch_xmms.c
--- a/src/sndstretch/sndstretch_xmms.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/sndstretch/sndstretch_xmms.c	Fri Aug 03 07:21:36 2007 +0300
@@ -57,7 +57,7 @@
 
 EffectPlugin *sndstretch_eplist[] = { &sndstretch_ep, NULL };
 
-DECLARE_PLUGIN(sndstretch, NULL, NULL, NULL, NULL, sndstretch_eplist, NULL, NULL);
+DECLARE_PLUGIN(sndstretch, NULL, NULL, NULL, NULL, sndstretch_eplist, NULL, NULL, NULL);
 
 static struct {
 	int handle;    // file handle
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/song_change/song_change.c
--- a/src/song_change/song_change.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/song_change/song_change.c	Fri Aug 03 07:21:36 2007 +0300
@@ -61,7 +61,7 @@
 };
 
 GeneralPlugin *songchange_gplist[] = { &sc_gp, NULL };
-DECLARE_PLUGIN(songchange, NULL, NULL, NULL, NULL, NULL, songchange_gplist, NULL);
+DECLARE_PLUGIN(songchange, NULL, NULL, NULL, NULL, NULL, songchange_gplist, NULL, NULL);
 
 static void bury_child(int signal)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/spectrum/spectrum.c
--- a/src/spectrum/spectrum.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/spectrum/spectrum.c	Fri Aug 03 07:21:36 2007 +0300
@@ -79,7 +79,7 @@
 
 VisPlugin *spectrum_vplist[] = { &fsanalyzer_vp, NULL };
 
-DECLARE_PLUGIN(spectrum, NULL, NULL, NULL, NULL, NULL, NULL, spectrum_vplist);
+DECLARE_PLUGIN(spectrum, NULL, NULL, NULL, NULL, NULL, NULL, spectrum_vplist,NULL);
 
 static void fsanalyzer_destroy_cb(GtkWidget *w,gpointer data) {
 	fsanalyzer_vp.disable_plugin(&fsanalyzer_vp);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/statusicon/si.c
--- a/src/statusicon/si.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/statusicon/si.c	Fri Aug 03 07:21:36 2007 +0300
@@ -28,7 +28,7 @@
 
 
 GeneralPlugin *statusicon_gplist[] = { &si_gp, NULL };
-DECLARE_PLUGIN(statusicon, NULL, NULL, NULL, NULL, NULL, statusicon_gplist, NULL);
+DECLARE_PLUGIN(statusicon, NULL, NULL, NULL, NULL, NULL, statusicon_gplist, NULL, NULL);
 
 static gboolean plugin_active = FALSE;
 
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/stdio/stdio.c
--- a/src/stdio/stdio.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/stdio/stdio.c	Fri Aug 03 07:21:36 2007 +0300
@@ -277,4 +277,4 @@
 #endif
 }
 
-DECLARE_PLUGIN(stdio, init, cleanup, NULL, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(stdio, init, cleanup, NULL, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/stereo_plugin/stereo.c
--- a/src/stereo_plugin/stereo.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/stereo_plugin/stereo.c	Fri Aug 03 07:21:36 2007 +0300
@@ -34,7 +34,7 @@
 
 EffectPlugin *stereo_eplist[] = { &stereo_ep, NULL };
 
-DECLARE_PLUGIN(stereo, NULL, NULL, NULL, NULL, stereo_eplist, NULL, NULL);
+DECLARE_PLUGIN(stereo, NULL, NULL, NULL, NULL, stereo_eplist, NULL, NULL, NULL);
 
 static void init(void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/sun/sun.c
--- a/src/sun/sun.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/sun/sun.c	Fri Aug 03 07:21:36 2007 +0300
@@ -52,7 +52,7 @@
 
 OutputPlugin *sun_oplist[] = { &sun_op, NULL };
 
-DECLARE_PLUGIN(sun, NULL, NULL, NULL, sun_oplist, NULL, NULL, NULL);
+DECLARE_PLUGIN(sun, NULL, NULL, NULL, sun_oplist, NULL, NULL, NULL, NULL);
 
 void sun_init(void)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/timidity/src/xmms-timidity.c
--- a/src/timidity/src/xmms-timidity.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/timidity/src/xmms-timidity.c	Fri Aug 03 07:21:36 2007 +0300
@@ -69,7 +69,7 @@
 
 InputPlugin *timidity_iplist[] = { &xmmstimid_ip, NULL };
 
-DECLARE_PLUGIN(timidity, NULL, NULL, timidity_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(timidity, NULL, NULL, timidity_iplist, NULL, NULL, NULL, NULL, NULL);
 
 static struct {
 	gchar *config_file;
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/tonegen/tonegen.c
--- a/src/tonegen/tonegen.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/tonegen/tonegen.c	Fri Aug 03 07:21:36 2007 +0300
@@ -265,4 +265,4 @@
 
 InputPlugin *tonegen_iplist[] = { &tone_ip, NULL };
 
-DECLARE_PLUGIN(tonegen, NULL, NULL, tonegen_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(tonegen, NULL, NULL, tonegen_iplist, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/tta/libtta.c
--- a/src/tta/libtta.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/tta/libtta.c	Fri Aug 03 07:21:36 2007 +0300
@@ -118,7 +118,7 @@
 
 InputPlugin *tta_iplist[] = { &tta_ip, NULL };
 
-DECLARE_PLUGIN(tta, NULL, NULL, tta_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(tta, NULL, NULL, tta_iplist, NULL, NULL, NULL, NULL, NULL);
 
 size_t
 file_size (char *filename)
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/voice_removal/voice_removal.c
--- a/src/voice_removal/voice_removal.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/voice_removal/voice_removal.c	Fri Aug 03 07:21:36 2007 +0300
@@ -45,7 +45,7 @@
 
 EffectPlugin *voice_eplist[] = { &xmms_plugin, NULL };
 
-DECLARE_PLUGIN(voice_removal, NULL, NULL, NULL, NULL, voice_eplist, NULL, NULL);
+DECLARE_PLUGIN(voice_removal, NULL, NULL, NULL, NULL, voice_eplist, NULL, NULL, NULL);
 
 static int apply_effect (gpointer *d, gint length, AFormat afmt,
 			gint srate, gint nch) {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/vorbis/vorbis.c	Fri Aug 03 07:21:36 2007 +0300
@@ -129,7 +129,7 @@
 
 InputPlugin *vorbis_iplist[] = { &vorbis_ip, NULL };
 
-DECLARE_PLUGIN(vorbis, NULL, NULL, vorbis_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(vorbis, NULL, NULL, vorbis_iplist, NULL, NULL, NULL, NULL, NULL);
 
 static OggVorbis_File vf;
 
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/vtx/vtx.c
--- a/src/vtx/vtx.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/vtx/vtx.c	Fri Aug 03 07:21:36 2007 +0300
@@ -322,4 +322,4 @@
 
 InputPlugin *vtx_iplist[] = { &vtx_ip, NULL };
 
-DECLARE_PLUGIN(vtx, NULL, NULL, vtx_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(vtx, NULL, NULL, vtx_iplist, NULL, NULL, NULL, NULL, NULL);
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/wav/wav-sndfile.c
--- a/src/wav/wav-sndfile.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/wav/wav-sndfile.c	Fri Aug 03 07:21:36 2007 +0300
@@ -369,4 +369,4 @@
 
 InputPlugin *wav_iplist[] = { &wav_ip, NULL };
 
-DECLARE_PLUGIN(wav-sndfile, init, fini, wav_iplist, NULL, NULL, NULL, NULL)
+DECLARE_PLUGIN(wav-sndfile, init, fini, wav_iplist, NULL, NULL, NULL, NULL, NULL)
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/wav/wav.c
--- a/src/wav/wav.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/wav/wav.c	Fri Aug 03 07:21:36 2007 +0300
@@ -74,7 +74,7 @@
 
 InputPlugin *wav_iplist[] = { &wav_ip, NULL };
 
-DECLARE_PLUGIN(wav, NULL, NULL, wav_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(wav, NULL, NULL, wav_iplist, NULL, NULL, NULL, NULL, NULL);
 
 static void
 wav_init(void)
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/wavpack/libwavpack.cxx
--- a/src/wavpack/libwavpack.cxx	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/wavpack/libwavpack.cxx	Fri Aug 03 07:21:36 2007 +0300
@@ -249,7 +249,7 @@
 
 InputPlugin *wv_iplist[] = { &mod, NULL };
 
-DECLARE_PLUGIN(wavpack, NULL, NULL, wv_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(wavpack, NULL, NULL, wv_iplist, NULL, NULL, NULL, NULL,NULL);
 
 static int
 wv_is_our_fd(gchar *filename, VFSFile *file)
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/wma/wma.c
--- a/src/wma/wma.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/wma/wma.c	Fri Aug 03 07:21:36 2007 +0300
@@ -107,7 +107,7 @@
 
 InputPlugin *wma_iplist[] = { &wma_ip, NULL };
 
-DECLARE_PLUGIN(wma, NULL, NULL, wma_iplist, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(wma, NULL, NULL, wma_iplist, NULL, NULL, NULL, NULL, NULL);
 
 static gchar *str_twenty_to_space(gchar * str)
 {
diff -r 2e25c7a29ac2 -r 761e17b23e0c src/xspf/xspf.c
--- a/src/xspf/xspf.c	Sat Jul 28 14:45:30 2007 +0300
+++ b/src/xspf/xspf.c	Fri Aug 03 07:21:36 2007 +0300
@@ -639,4 +639,4 @@
     playlist_container_unregister(&plc_xspf);
 }
 
-DECLARE_PLUGIN(xspf, init, cleanup, NULL, NULL, NULL, NULL, NULL);
+DECLARE_PLUGIN(xspf, init, cleanup, NULL, NULL, NULL, NULL, NULL, NULL);