LADSPA-base now as library, fixed binary files

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@405 0778d3d1-df1d-0410-868b-ea421aaaa00d

ChangeLog

@@ -1,5 +1,26 @@
 2006-09-20	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* plugins/*/*.png:
+	* data/locale/*.qm:
+	* data/samples/*:
+	* data/themes/*:
+	re-added all binary files as they were corrupted during SVN-migration
+	for some reason
+
+	* configure.in:
+	* Makefile.am:
+	* plugins/ladspa_base/*:
+	* include/config_mgr.h:
+	* include/engine.h:
+	* include/setup_dialog.h:
+	* src/audio/audio_port.cpp:
+	* src/core/config_mgr.cpp:
+	* src/core/engine.cpp:
+	* src/core/setup_dialog.cpp:
+	* src/lmms_single_source.cpp:
+	moved all LADSPA-related code into separate library against which LMMS
+	is linked when compiling with LADSPA-support
+
 	* Makefile.cvs:
 	renamed to Makefile.svn as LMMS-CVS-repo was migrated to subversion
 

Makefile.am

@@ -71,9 +71,6 @@ lmms_MOC =						\
 		./kmultitabbar.moc			\
 		./kmultitabbar-qt3.moc			\
 		./knob.moc				\
-		./ladspa_control.moc			\
-		./ladspa_port_dialog.moc		\
-		./ladspa_subplugin_features.moc		\
 		./lcd_spinbox.moc			\
 		./led_checkbox.moc			\
 		./main_window.moc			\
@@ -153,8 +150,6 @@ lmms_SOURCES =								\
 		$(srcdir)/src/core/file_browser.cpp			\
 		$(srcdir)/src/core/import_filter.cpp			\
 		$(srcdir)/src/core/instrument.cpp			\
-		$(srcdir)/src/core/ladspa_port_dialog.cpp		\
-		$(srcdir)/src/core/ladspa_subplugin_features.cpp	\
 		$(srcdir)/src/core/main_window.cpp			\
 		$(srcdir)/src/core/main.cpp				\
 		$(srcdir)/src/core/meter_dialog.cpp			\
@@ -181,8 +176,6 @@ lmms_SOURCES =								\
 		$(srcdir)/src/lib/journalling_object.cpp		\
 		$(srcdir)/src/lib/project_journal.cpp			\
 		$(srcdir)/src/lib/embed.cpp				\
-		$(srcdir)/src/lib/ladspa_2_lmms.cpp			\
-		$(srcdir)/src/lib/ladspa_manager.cpp			\
 		$(srcdir)/src/lib/mmp.cpp				\
 		$(srcdir)/src/lib/oscillator.cpp			\
 		$(srcdir)/src/lib/sample_buffer.cpp			\
@@ -208,7 +201,6 @@ lmms_SOURCES =								\
 		$(srcdir)/src/widgets/group_box.cpp			\
 		$(srcdir)/src/widgets/kmultitabbar.cpp			\
 		$(srcdir)/src/widgets/knob.cpp				\
-		$(srcdir)/src/widgets/ladspa_control.cpp		\
 		$(srcdir)/src/widgets/lcd_spinbox.cpp			\
 		$(srcdir)/src/widgets/led_checkbox.cpp			\
 		$(srcdir)/src/widgets/nstate_button.cpp			\
@@ -330,7 +322,6 @@ lmms_SOURCES =								\
 		$(srcdir)/include/dummy_instrument.h			\
 		$(srcdir)/include/instrument_play_handle.h		\
 		$(srcdir)/include/string_pair_drag.h			\
-		$(srcdir)/include/ladspa_manager.h			\
 		$(srcdir)/include/midi_tab_widget.h			\
 		$(srcdir)/include/audio_port.h				\
 		$(srcdir)/include/tool_button.h				\
@@ -353,16 +344,11 @@ lmms_SOURCES =								\
 		$(srcdir)/include/effect_control_dialog.h		\
 		$(srcdir)/include/effect_label.h			\
 		$(srcdir)/include/effect_tab_widget.h			\
-		$(srcdir)/include/ladspa_2_lmms.h			\
-		$(srcdir)/include/ladspa_control.h			\
-		$(srcdir)/include/ladspa_port_dialog.h			\
 		$(srcdir)/include/rack_plugin.h				\
 		$(srcdir)/include/rack_view.h				\
 		$(srcdir)/include/effect_select_dialog.h		\
 		$(srcdir)/include/dummy_effect.h			\
 		$(srcdir)/include/meter_dialog.h			\
-		$(srcdir)/include/ladspa_subplugin_features.h		\
-		$(srcdir)/include/ladspa_base.h				\
 		$(srcdir)/include/qxembed.h
 
 
@@ -400,7 +386,11 @@ if HAVE_LIBSF
 LIB_SF_LDADD = -lsndfile
 endif
 
-lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_FST_LDADD) -ldl
+if LADSPA_SUPPORT
+LIB_LADSPABASE_LDADD = -Lplugins/ladspa_base -lladspabase
+endif
+
+lmms_LDADD = $(QT_LDADD) $(LIB_SDL_LDADD) $(LIB_ASOUND_LDADD) $(LIB_JACK_LDADD) $(LIB_SDL_SOUND_LDADD) $(LIB_VORBIS_LDADD) $(LIB_SRC_LDADD) $(LIB_SF_LDADD) $(LIB_LADSPABASE_LDADD) -ldl
 lmms_LDFLAGS = -rdynamic
 #-rpath $(pkglibdir)
 

configure.in

@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.2.1-cvs20060918, lmms-devel/at/lists/dot/sf/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.2.1-cvs20060918)
+AC_INIT(lmms, 0.2.1-svn20060920, lmms-devel/at/lists/dot/sf/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.2.1-svn20060920)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -16,7 +16,7 @@ AC_PROG_LIBTOOL
 
 # -fomit-frame-pointer crashes wine on Ubuntu Dapper--Danny 7/21/06
 #EXTRAFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las"
-EXTRAFLAGS="" #"-floop-optimize2 -fgcse-sm  -fgcse-las"
+EXTRAFLAGS="-O2 -g0" #"-floop-optimize2 -fgcse-sm  -fgcse-las"
 
 # Tested with GCC 4.0--needs to be tested with 4.1--Danny 7/21/06
 if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f1`" = "x4" ; then
@@ -26,8 +26,8 @@ if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f1`" = "x4" ; then
 	fi	
 fi
 
-CFLAGS="-O2 $CFLAGS $EXTRAFLAGS"
-CXXFLAGS="-O2 $CXXFLAGS $EXTRAFLAGS"
+CFLAGS="$CFLAGS $EXTRAFLAGS"
+CXXFLAGS="$CXXFLAGS $EXTRAFLAGS"
 
 AC_PATH_XTRA
 gw_CHECK_QT
@@ -207,11 +207,13 @@ AM_CONDITIONAL(VST_SUPPORT, test ! -z "$WINEGCC")
 AC_ARG_WITH(ladspa,
 	AS_HELP_STRING([--without-ladspa], [enable support for LADSPA]), , [ with_ladspa=yes ] )
 AH_TEMPLATE(HAVE_LADSPA_H, [Define to 1 if you have the <ladspa.h> header file.])
+AH_TEMPLATE(LADSPA_SUPPORT, [Define to 1 if you have the <ladspa.h> header file.])
 if test "x$with_ladspa" = "xyes" ; then
 	AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA_H="true")
 fi
 if test ! -z "$HAVE_LADSPA_H" ; then
 	AC_DEFINE(HAVE_LADSPA_H)
+	AC_DEFINE(LADSPA_SUPPORT)
 fi
 #AM_CONDITIONAL(HAVE_LADSPA_H, test ! -z "$HAVE_LADSPA_H")
 AM_CONDITIONAL(LADSPA_SUPPORT, test ! -z "$HAVE_LADSPA_H")
@@ -504,6 +506,7 @@ AC_CONFIG_FILES([Makefile
 		 plugins/audio_file_processor/Makefile
 		 plugins/bit_invader/Makefile
 		 plugins/flp_import/Makefile
+		 plugins/ladspa_base/Makefile
 		 plugins/ladspa_effect/Makefile
 		 plugins/midi_import/Makefile
 		 plugins/organic/Makefile