# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1218652655 -10800
# Node ID 8220728cc77bea8a5f98e9676b2a61011d0f7380
# Parent  19c696215a73b0808f0479b3a011a96b1f2fc5d0
Use full DECLARE_PLUGIN definition (no missing initializers); Use NULL
init/fini for EffectPlugin struct; Use different names for effect and
output plugin versions.

diff -r 19c696215a73 -r 8220728cc77b src/icecast/Makefile
--- a/src/icecast/Makefile	Wed Aug 13 20:41:50 2008 +0300
+++ b/src/icecast/Makefile	Wed Aug 13 21:37:35 2008 +0300
@@ -10,7 +10,7 @@
 
 plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
-CFLAGS += ${PLUGIN_CFLAGS} ${SHOUT_CFLAGS}
+CFLAGS += -W -Wall ${PLUGIN_CFLAGS} ${SHOUT_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${FILEWRITER_CFLAGS} ${OGG_VORBIS_CFLAGS} ${SHOUT_CFLAGS} -I../../intl -I../..
 LDFLAGS += ${AUDLDFLAGS}
-LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS} ${SHOUT_LIBS} -lSAD
+LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS} ${SHOUT_LIBS} -lSAD -lshout
diff -r 19c696215a73 -r 8220728cc77b src/icecast/icecast.c
--- a/src/icecast/icecast.c	Wed Aug 13 20:41:50 2008 +0300
+++ b/src/icecast/icecast.c	Wed Aug 13 21:37:35 2008 +0300
@@ -114,7 +114,7 @@
 
 OutputPlugin ice_op =
 {
-    .description = "Icecast Plugin",
+    .description = "Icecast Plugin (output)",
     .init = ice_init,
     .cleanup = ice_cleanup,
     .about = ice_about,
@@ -132,9 +132,9 @@
 
 EffectPlugin ice_ep =
 {
-        .description = "Icecast Plugin",
-        .init = ice_init,
-        .cleanup = ice_cleanup,
+        .description = "Icecast Plugin (effect)",
+        .init = NULL,
+        .cleanup = NULL,
         .about = ice_about,
         .configure = ice_configure,
         .mod_samples = ice_mod_samples,
@@ -145,7 +145,7 @@
 EffectPlugin *ice_eplist[] = { &ice_ep, NULL };
 
 /*SIMPLE_OUTPUT_PLUGIN(icecast, ice_oplist);*/
-DECLARE_PLUGIN(icecast, NULL, NULL, NULL, ice_oplist, ice_eplist);
+DECLARE_PLUGIN(icecast, NULL, NULL, NULL, ice_oplist, ice_eplist, NULL, NULL, NULL, NULL)
 /*SIMPLE_EFFECT_PLUGIN(icecast, ice_eplist);*/
 
 static void set_plugin(void)