changeset 3135:85b7dcee821f

crossfade: another portion of cleanups, remove legacy stuff

--- a/src/crossfade/cfgutil.c	Thu May 07 13:13:54 2009 +0200
+++ b/src/crossfade/cfgutil.c	Thu May 07 14:11:51 2009 +0200
@@ -361,7 +361,6 @@
 		xmms_cfg_read_boolean(cfgfile, section, "no_xfade_if_same_file",&config->no_xfade_if_same_file);
 
 		/* config items introduced by v0.3.3 */
-		//xmms_cfg_read_string (cfgfile, section, "alt_mixer_device",     &config->oss_alt_mixer_device);
 		xmms_cfg_read_boolean(cfgfile, section, "gap_crossing",         &config->gap_crossing);
 
 		/* fade configs */

--- a/src/crossfade/crossfade.h	Thu May 07 13:13:54 2009 +0200
+++ b/src/crossfade/crossfade.h	Thu May 07 14:11:51 2009 +0200
@@ -24,9 +24,6 @@
 #ifndef _CROSSFADE_H_
 #define _CROSSFADE_H_
 
-#define COMPILE_FOR_AUDACIOUS
-#define AUDACIOUS_ABI_VERSION 2
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif

--- a/src/crossfade/player.c	Thu May 07 13:13:54 2009 +0200
+++ b/src/crossfade/player.c	Thu May 07 14:11:51 2009 +0200
@@ -24,58 +24,6 @@
 #include <audacious/plugin.h>
 #include "player.h"
 
-#if defined(COMPILE_FOR_XMMS) /***********************************************/
-
-gboolean get_input_playing();
-gboolean xfplayer_input_playing() {
-	return get_input_playing();
-}
-
-gint get_playlist_position();
-gint xfplaylist_get_position() {
-	return get_playlist_position();
-}
-
-gchar *playlist_get_filename(gint pos);
-gchar *xfplaylist_get_filename(gint pos) {
-	return playlist_get_filename(pos);
-}
-
-gchar *playlist_get_songtitle(gint pos);
-gchar *xfplaylist_get_songtitle(gint pos) {
-	return playlist_get_songtitle(pos);
-}
-
-gint playlist_get_current_length();
-gint xfplaylist_current_length() {
-	return playlist_get_current_length();
-}
-
-GList *get_output_list();
-GList *xfplayer_get_output_list () {
-	return get_output_list();
-}
-
-GList *get_effect_list();
-GList *xfplayer_get_effect_list() {
-	return get_effect_list();
-}
-
-gboolean xfplayer_effects_enabled() {
-	return effects_enabled();
-}
-
-EffectPlugin *xfplayer_get_current_effect_plugin() {
-	return get_current_effect_plugin();
-}
-
-gboolean xfplayer_check_realtime_priority() {
-	return xmms_check_realtime_priority();
-}
-
-#elif defined(COMPILE_FOR_AUDACIOUS) /****************************************/
-#if AUDACIOUS_ABI_VERSION >= 2 /*--------------------------------------------*/
-
 gboolean xfplayer_input_playing() {
 	return audacious_drct_get_playing();
 }
@@ -105,58 +53,6 @@
 	return aud_get_output_list();
 }
 
-#else /*---------------------------------------------------------------------*/
-
-#if AUDACIOUS_ABI_VERSION >= 1
-gboolean playback_get_playing();  /* >= Audacious-1.3.0 */
-gboolean xfplayer_input_playing() {
-	return playback_get_playing();
-}
-#else
-gboolean bmp_playback_get_playing();  /* Audacious (old) */
-gboolean xfplayer_input_playing() {
-	return bmp_playback_get_playing();
-}
-#endif
-
-gint xfplaylist_get_position() {
-	return playlist_get_position(playlist_get_active());
-}
-
-gchar *xfplaylist_get_filename(gint pos) {
-	char *uri = playlist_get_filename(playlist_get_active(), pos);
-	return g_filename_from_uri(uri, NULL, NULL);
-}
-
-gchar *xfplaylist_get_songtitle(gint pos) {
-	return playlist_get_songtitle(playlist_get_active(), pos);
-}
-
-gint xfplaylist_current_length() {
-	return playlist_get_current_length(playlist_get_active());
-}
-
-GList *get_output_list();
-GList *xfplayer_get_output_list() {
-	return get_output_list();
-}
-
-#endif /*--------------------------------------------------------------------*/
-
-GList *xfplayer_get_effect_list() {
-	return NULL;
-}
-
-EffectPlugin *xfplayer_get_current_effect_plugin() {
-	return NULL;
-}
-
-gboolean xfplayer_effects_enabled() {
-	return FALSE;
-}
-
 gboolean xfplayer_check_realtime_priority() {
 	return FALSE;
 }
-
-#endif /**********************************************************************/

--- a/src/crossfade/player.h	Thu May 07 13:13:54 2009 +0200
+++ b/src/crossfade/player.h	Thu May 07 14:11:51 2009 +0200
@@ -35,10 +35,6 @@
 
 GList *xfplayer_get_output_list();
 
-GList        *xfplayer_get_effect_list();
-EffectPlugin *xfplayer_get_current_effect_plugin();
-gboolean      xfplayer_effects_enabled();
-
 gboolean xfplayer_check_realtime_priority();
 
 #endif /* _PLAYER_H_ */