# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1240573128 18000
# Node ID a0ba6102131d4d88a0141f758a268ac67e61f532
# Parent  43a336a7791bfb1dad942c837552eaf93f91927e
crossfade-ng: remove more cruft, kill some warnings.

diff -r 43a336a7791b -r a0ba6102131d src/crossfade/crossfade.c
--- a/src/crossfade/crossfade.c	Fri Apr 24 06:28:39 2009 -0500
+++ b/src/crossfade/crossfade.c	Fri Apr 24 06:38:48 2009 -0500
@@ -58,7 +58,7 @@
 #undef  DEBUG_HARDCORE
 
 /* output plugin callback prototypes */
-static void xfade_init();
+static OutputPluginInitStatus xfade_init();
 static void xfade_cleanup();  /* audacious and patched only */
 static void xfade_set_volume(int l, int r);
 static void xfade_get_volume(int *l, int *r);
@@ -119,10 +119,6 @@
 static gboolean *xmms_playlist_get_info_going = NULL;   /* XMMS */
 static gboolean *xmms_is_quitting             = NULL;   /* XMMS */
 static gboolean *input_stopped_for_restart    = NULL;   /* XMMS */
-static char *  (*playlist_get_fadeinfo)(int)  = NULL;   /* XMMS patch */
-
-static void (*xmms_input_get_song_info)(gchar *, gchar **, gint *); /* XMMS */
-static gchar **xmms_gentitle_format = NULL;   /* XMMS private cfg */
 
 /* This function has been stolen from libxmms/util.c. */
 void xfade_usleep(gint usec)
@@ -177,24 +173,6 @@
 
 static gchar zero_4k[4096];
 
-#ifdef TIMING_COMMENTS
-typedef struct
-{
-	gboolean enable;
-	gint     len_ms, volume, skip_ms, ofs_ms;
-}
-timing_half_config_t;
-
-typedef struct
-{
-	timing_half_config_t in;
-	timing_half_config_t out;
-}
-timing_config_t;
-
-static timing_config_t last_timing, current_timing;
-#endif
-
 /*
  *  Available fade configs:
  * 
@@ -439,7 +417,7 @@
 	return 0;
 }
 
-static void
+static OutputPluginInitStatus
 xfade_init()
 {
 	/* load config */
@@ -481,6 +459,8 @@
 
 	/* realize config -- will also setup the pre-mixing effect plugin */
 	xfade_realize_config();
+
+	return OUTPUT_PLUGIN_INIT_NO_DEVICES;
 }
 
 static void
diff -r 43a336a7791b -r a0ba6102131d src/crossfade/crossfade.h
--- a/src/crossfade/crossfade.h	Fri Apr 24 06:28:39 2009 -0500
+++ b/src/crossfade/crossfade.h	Fri Apr 24 06:38:48 2009 -0500
@@ -45,7 +45,6 @@
 #include "debug.h"
 
 #undef  VOLUME_NORMALIZER
-#define TIMING_COMMENTS
 
 #define OUTPUT_RATE the_rate
 #define OUTPUT_NCH  2
diff -r 43a336a7791b -r a0ba6102131d src/crossfade/format.c
--- a/src/crossfade/format.c	Fri Apr 24 06:28:39 2009 -0500
+++ b/src/crossfade/format.c	Fri Apr 24 06:38:48 2009 -0500
@@ -152,8 +152,10 @@
 			return "FMT_S16_BE";
 		case FMT_S16_NE:
 			return "FMT_S16_NE";
+		default:
+			break;
 	}
-	return "UNKNOWN";
+	return "<unsupported>";
 }
 
 void