# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1240722202 18000
# Node ID fbe76a1d61e226415083fa77dae0c7eab87b6991
# Parent  8f56795e348d1712a73ed3654b7fc08b4a90d834
crossfade-ng: do not force ourselves as default, kthx

diff -r 8f56795e348d -r fbe76a1d61e2 src/crossfade/crossfade.c
--- a/src/crossfade/crossfade.c	Sun Apr 26 00:01:59 2009 -0500
+++ b/src/crossfade/crossfade.c	Sun Apr 26 00:03:22 2009 -0500
@@ -108,7 +108,6 @@
 
 /* internal prototypes */
 static void load_symbols();
-static void output_list_hack();
 static gint open_output();
 static void buffer_reset(buffer_t *buf, config_t *cfg);
 static void *buffer_thread_f(void *arg);
@@ -447,9 +446,6 @@
 	/* load any dynamic linked symbols */
 	load_symbols();
 
-	/* HACK: make sure we are at the beginning of XMMS' output plugin list */
-	output_list_hack();
-
 	/* realize config -- will also setup the pre-mixing effect plugin */
 	xfade_realize_config();
 
@@ -508,30 +504,6 @@
 #endif
 }
 
-/*
-  HACK: Try to move ourselves to the beginning of XMMS output plugin list,
-        so that we will be freed first when XMMS is quitting. This way, we
-        avoid the segfault when using ALSA as the output plugin.     
-*/
-static void
-output_list_hack()
-{
-	GList *output_list = xfplayer_get_output_list();
-	if (!output_list)
-		return;
-
-	int i0 = g_list_index(output_list, xfade_op), i1;
-
-	GList *first = g_list_first(output_list);
-	GList *xfade = g_list_find(output_list, xfade_op);
-	xfade->data = first->data;
-	first->data = xfade_op;
-
-	i1 = g_list_index(output_list, xfade_op);
-	if (i0 != i1)
-		DEBUG(("[crossfade] output_list_hack: crossfade moved from index %d to %d\n", i0, i1));
-}
-
 void
 xfade_get_volume(int *l, int *r)
 {
@@ -1932,9 +1904,6 @@
 		 *       XMMS tries to cleanup an output plugin which
 		 *       we are still using.
 		 *
-		 * NOTE: This hack has become obsolete as of 0.3.5.
-		 *       See output_list_hack().
-		 *
 		 * NOTE: Not quite. There still are some problems when
 		 *       XMMS is exitting while a song is playing. So
 		 *       this HACK has been enabled again.