# HG changeset patch
# User Michal Lipski <tallica@o2.pl>
# Date 1241885218 -7200
# Node ID de2f796d6f040e564d185b259af0a2cb1f14dfe6
# Parent  40e5d243971e42957cad838210a4a47398894990
crossfade: fix preprocessor conditional compilation

diff -r 40e5d243971e -r de2f796d6f04 src/crossfade/cfgutil.c
--- a/src/crossfade/cfgutil.c	Sat May 09 17:57:43 2009 +0200
+++ b/src/crossfade/cfgutil.c	Sat May 09 18:06:58 2009 +0200
@@ -380,11 +380,7 @@
 		DEBUG(("[crossfade] load_config: error loading config, using defaults\n"));
 
 #ifdef PRESET_SUPPORT
-#ifdef COMPILE_FOR_AUDACIOUS
 	filename = g_strconcat(g_get_home_dir(), "/.audacious/crossfade-presets", NULL);
-#else
-	filename = g_strconcat(g_get_home_dir(), "/.xmms/crossfade-presets", NULL);
-#endif
 	scan_presets(filename);
 	g_free(filename);
 #endif
diff -r 40e5d243971e -r de2f796d6f04 src/crossfade/crossfade.c
--- a/src/crossfade/crossfade.c	Sat May 09 17:57:43 2009 +0200
+++ b/src/crossfade/crossfade.c	Sat May 09 18:06:58 2009 +0200
@@ -1852,7 +1852,6 @@
 		return;
 	}
 
-#if defined(COMPILE_FOR_AUDACIOUS) && AUDACIOUS_ABI_VERSION >= 2
 	/* HACK: to distinguish between STOP and EOP, check Audacious'
 	   input_playing() variable. It seems to be TRUE at this point
 	   only when the end of the playlist is reached.
@@ -1864,16 +1863,6 @@
 	*/
 	if (xfplayer_input_playing())
 		playing = FALSE;
-#else
-	/* HACK: use patched XMMS 'input_stopped_for_restart' */
-	if (input_stopped_for_restart && *input_stopped_for_restart)
-	{
-		DEBUG(("[crossfade] close: playback will restart soon\n"));
-		output_restart = TRUE;
-	}
-	else
-		output_restart = FALSE;
-#endif
 
 	if (playing)
 	{
@@ -2042,7 +2031,6 @@
 	if (!file)
 		file = g_strdup(xfplaylist_get_songtitle(pos));
 
-#if defined(COMPILE_FOR_AUDACIOUS)
 	/* HACK: special handling for audacious, which just calls flush(0) on a songchange */
 	if (file && last_filename && strcmp(file, last_filename) != 0)
 	{
@@ -2055,7 +2043,6 @@
 		DEBUG(("[crossfade] flush: filename changed, forcing close/reopen... done\n"));
 		return;
 	}
-#endif
 
 	/* lock buffer */
 	MUTEX_LOCK(&buffer_mutex);