diff -ur xmms_ladspa-1.1/Makefile bmp-ladspa-1.1/Makefile --- xmms_ladspa-1.1/Makefile 2005-03-16 03:39:32.000000000 +0100 +++ bmp-ladspa-1.1/Makefile 2005-05-14 17:22:16.000000000 +0200 @@ -4,15 +4,32 @@ DOCS= README PLUGINS COPYING ChangeLog CODE= Makefile ladspa.c ladspa.h -CFLAGS= -fPIC `gtk-config --cflags` +CFLAGS= -fPIC -all: ladspa.so + +CFLAGS_FOR_BMP=`pkg-config --cflags bmp` $(CFLAGS) +CFLAGS_FOR_XMMS=`xmms-config --cflags` $(CFLAGS) + +all: + @echo + @echo "Use 'make xmms' to build xmms ladspa plugin." + @echo "Use 'make bmp' to build bmp ladspa plugin." + @echo + +xmms: xmms-ladspa.so @echo - @echo "Now copy ladspa.so into your XMMS Effect plugin directory" + @echo "Now copy xmms-ladspa.so into your XMMS Effect plugin directory" @echo "e.g. ~/.xmms/Plugins/Effect or /usr/lib/xmms/Effect" @echo "But please, NOT WHILE XMMS IS RUNNING" @echo +bmp: bmp-ladspa.so + @echo + @echo "Now copy bmp-ladspa.so into your BMP Effect plugin directory" + @echo "e.g. ~/.bmp/Plugins/Effect or /usr/lib/bmp/Effect" + @echo "But please, NOT WHILE BMP IS RUNNING" + @echo + dist: mkdir xmms_ladspa-$(VER) cp $(DOCS) xmms_ladspa-$(VER) @@ -21,7 +38,11 @@ rm -r xmms_ladspa-$(VER) clean: - rm ladspa.so + rm -f xmms-ladspa.so + rm -f bmp-ladspa.so + +xmms-ladspa.so: ladspa.c + gcc -Wall -shared -o xmms-ladspa.so ladspa.c $(CFLAGS_FOR_XMMS) -DVERSION=\"$(VER)\" -ladspa.so: ladspa.c - gcc -Wall -shared -o ladspa.so ladspa.c $(CFLAGS) -DVERSION=\"$(VER)\" +bmp-ladspa.so: ladspa.c + gcc -Wall -shared -o bmp-ladspa.so ladspa.c $(CFLAGS_FOR_BMP) -DBUILD_FOR_BMP -DVERSION=\"$(VER)\" diff -ur xmms_ladspa-1.1/ladspa.c bmp-ladspa-1.1/ladspa.c --- xmms_ladspa-1.1/ladspa.c 2005-03-16 03:37:11.000000000 +0100 +++ bmp-ladspa-1.1/ladspa.c 2005-05-14 17:20:57.000000000 +0200 @@ -16,6 +16,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* BMP-ladspa port by Giacomo Lozito */ + #include #include #include @@ -24,8 +26,15 @@ #include #include #include + +#ifdef BUILD_FOR_BMP +#include +#include +#else #include #include +#endif + #include "ladspa.h" #ifndef PATH_MAX @@ -141,7 +150,11 @@ gchar *filename; gint k, plugins= 0; - filename= g_strdup_printf("%s/%s", g_get_home_dir(), "/.xmms/ladsparc"); + #ifdef BUILD_FOR_BMP + filename= g_strdup_printf("%s/%s", g_get_home_dir(), "/.bmp/ladsparc"); + #else + filename= g_strdup_printf("%s/%s", g_get_home_dir(), "/.xmms/ladsparc"); + #endif cfg = xmms_cfg_open_file(filename); if (cfg == NULL) { state.initialised = TRUE; @@ -290,7 +303,11 @@ G_UNLOCK (running_plugins); xmms_cfg_write_int(cfg, "session", "plugins", plugins); - filename= g_strdup_printf("%s/%s", g_get_home_dir(), "/.xmms/ladsparc"); + #ifdef BUILD_FOR_BMP + filename= g_strdup_printf("%s/%s", g_get_home_dir(), "/.bmp/ladsparc"); + #else + filename= g_strdup_printf("%s/%s", g_get_home_dir(), "/.xmms/ladsparc"); + #endif xmms_cfg_write_file(cfg, filename); g_free(filename); xmms_cfg_free(cfg); @@ -972,7 +989,11 @@ gtk_container_add(GTK_CONTAINER(config_window), vbox); - gtk_window_set_title(GTK_WINDOW(config_window), "XMMS " PLUGIN_NAME ); + #ifdef BUILD_FOR_BMP + gtk_window_set_title(GTK_WINDOW(config_window), "BMP " PLUGIN_NAME ); + #else + gtk_window_set_title(GTK_WINDOW(config_window), "XMMS " PLUGIN_NAME ); + #endif gtk_widget_set_usize(config_window, 380, 400); gtk_signal_connect (GTK_OBJECT (config_window), "delete_event", GTK_SIGNAL_FUNC (gtk_widget_hide_on_delete), NULL);