added LADSPA browser, fixed automatable sliders, workspace improvements

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

ChangeLog

@@ -1,3 +1,55 @@
+2007-11-23	Javier Serrano Polo <jasp00/at/terra/dot/es>
+
+	* Makefile.am:
+	* plugins/ladspa_browser/ladspa_browser.cpp:
+	* plugins/ladspa_browser/ladspa_browser.h:
+	* plugins/ladspa_browser/ladspa_description.cpp:
+	* plugins/ladspa_browser/ladspa_description.h:
+	* plugins/ladspa_browser/ladspa_port_dialog.cpp:
+	* plugins/ladspa_browser/ladspa_port_dialog.h:
+	* plugins/ladspa_browser/logo.png:
+	* plugins/ladspa_browser/Makefile.am:
+	* plugins/Makefile.am:
+	resurrected LADSPA browser
+
+	* plugins/ladspa_effect/ladspa_subplugin_features.cpp:
+	minor simplification
+
+	* src/core/song_editor.cpp:
+	* src/widgets/automatable_slider.cpp:
+	upgraded automatable sliders to Qt4
+
+	* configure.in:
+	* include/engine.h:
+	* plugins/Makefile.am:
+	* src/core/config_mgr.cpp:
+	* src/core/engine.cpp:
+	removed references to optional LADSPA support
+
+	* data/themes/default/style.css:
+	* src/core/main_window.cpp:
+	moved workspace background to style sheet
+
+	* src/core/main_window.cpp:
+	added workspace scroll bars
+
+	* include/track_container.h:
+	* src/core/song_editor.cpp:
+	removed obsolete centralWiget()
+
+	* plugins/live_tool/live_tool.cpp:
+	* plugins/live_tool/live_tool.h:
+	fixed i18n
+
+	* plugins/live_tool/live_tool.cpp:
+	cosmetic changes
+
+	* data/locale/ca.ts:
+	updated translation
+
+	* resources/*:
+	removed unused images
+
 2007-11-22  Paul Giblock <drfaygo/at/gmail/dot/com>
 
 	* src/widgets/text_float.cpp:

Makefile.am

@@ -73,7 +73,6 @@ lmms_MOC =						\
 		./kmultitabbar.moc			\
 		./knob.moc				\
  		./ladspa_control.moc			\
-		./ladspa_port_dialog.moc		\
 		./lcd_spinbox.moc			\
 		./led_checkbox.moc			\
 		./main_window.moc			\
@@ -169,7 +168,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_2_lmms.cpp			\
 		$(srcdir)/src/core/ladspa_manager.cpp			\
 		$(srcdir)/src/core/ladspa_control.cpp			\
@@ -384,7 +382,6 @@ lmms_SOURCES =								\
 		$(srcdir)/include/ladspa_manager.h			\
 		$(srcdir)/include/ladspa_2_lmms.h			\
 		$(srcdir)/include/ladspa_control.h			\
-		$(srcdir)/include/ladspa_port_dialog.h			\
 		$(srcdir)/include/ladspa_base.h				\
 		$(THIRD_PARTY_CODE)
 

configure.in

@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.4.0-svn20071120, lmms-devel/at/lists/dot/sf/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20071120)
+AC_INIT(lmms, 0.4.0-svn20071123, lmms-devel/at/lists/dot/sf/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20071123)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -253,22 +253,12 @@ AM_CONDITIONAL(AMD64_BUILD, test "x$AMD64_BUILD" = "xyes")
 
 
 # check for LADSPA-SDK
-AC_ARG_WITH(ladspa,
-	AS_HELP_STRING([--without-ladspa], [disable 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
+AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA_H="true")
 if test ! -z "$HAVE_LADSPA_H" ; then
 	AC_DEFINE(HAVE_LADSPA_H)
 fi
-#if [ "$build_linux" = "true" ] ; then
-	AC_DEFINE(LADSPA_SUPPORT)
-#fi
 #AM_CONDITIONAL(HAVE_LADSPA_H, test ! -z "$HAVE_LADSPA_H")
-#AM_CONDITIONAL(LADSPA_SUPPORT, test "$build_linux" = "true" )
-AM_CONDITIONAL(LADSPA_SUPPORT, test true )
 
 
 # check for STK
@@ -650,6 +640,7 @@ AC_CONFIG_FILES([Makefile
 		 plugins/bit_invader/Makefile
 		 plugins/flp_import/Makefile
 		 plugins/kicker/Makefile
+		 plugins/ladspa_browser/Makefile
 		 plugins/ladspa_effect/Makefile
 		 plugins/ladspa_effect/caps/Makefile
 		 plugins/lb302/Makefile
@@ -820,32 +811,21 @@ fi
 
 
 
-#if test "$build_linux" = "true" ; then
-	PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LADSPA-plugins"
-	if test -z "$HAVE_LADSPA_H" ; then
-		echo " ========================"
-		echo " ===  LMMS - WARNING  ======================================================="
-		echo " ========================"
-		echo " ="
-		echo " = As the header file ladspa.h could not be found on your system, a version"
-		echo " = shipped with LMMS will be used. This is no problem at all but generally"
-		echo " = it's better to use files being customized to your system/distribution."
-		echo " = If you encounter problems related to LADSPA-support, try to install"
-		echo " = LADSPA-SDK-package (ladspa-sdk, ladspa-dev or similiar) and run configure"
-		echo " = again."
-		echo " ="
-		with_warnings="true"
-	fi
-#else
-#	echo " ========================"
-#	echo " ===  LMMS - WARNING  ======================================================="
-#	echo " ========================"
-#	echo " ="
-#	echo " = You're building LMMS for a platform other than Linux which will prevent"
-#	echo " = configure from enabling LADSPA-support."
-#	echo " ="
-#	with_warnings="true"
-#fi
+PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LADSPA-plugins"
+if test -z "$HAVE_LADSPA_H" ; then
+	echo " ========================"
+	echo " ===  LMMS - WARNING  ======================================================="
+	echo " ========================"
+	echo " ="
+	echo " = As the header file ladspa.h could not be found on your system, a version"
+	echo " = shipped with LMMS will be used. This is no problem at all but generally"
+	echo " = it's better to use files being customized to your system/distribution."
+	echo " = If you encounter problems related to LADSPA-support, try to install"
+	echo " = LADSPA-SDK-package (ladspa-sdk, ladspa-dev or similiar) and run configure"
+	echo " = again."
+	echo " ="
+	with_warnings="true"
+fi
 
 
 

data/themes/default/style.css

@@ -1,5 +1,9 @@
 /* LMMS style sheet */
 
+QMdiArea {
+	background-image: url(resources:background_artwork.png);
+}
+
 captionMenu::item:disabled {
 	color: white;
 	background-color: rgb(0, 0, 192);

include/engine.h

@@ -40,9 +40,8 @@ class mixer;
 class pianoRoll;
 class projectNotes;
 class songEditor;
-#ifdef LADSPA_SUPPORT
 class ladspa2LMMS;
-#endif
+
 
 class engine
 {
@@ -95,12 +94,10 @@ public:
 		return( s_automationEditor );
 	}
 
-#ifdef LADSPA_SUPPORT
 	static ladspa2LMMS * getLADSPAManager( void )
 	{
 		return( s_ladspaManager );
 	}
-#endif
 
 	static float framesPerTact64th( void )
 	{
@@ -126,10 +123,7 @@ private:
 	static pianoRoll * s_pianoRoll;
 	static projectNotes * s_projectNotes;
 	static projectJournal * s_projectJournal;
-	
-#ifdef LADSPA_SUPPORT
 	static ladspa2LMMS * s_ladspaManager;
-#endif
 
 	static QMap<QString, QString> s_sample_extensions;
 

include/ladspa_browser.h

@@ -1,79 +0,0 @@
-#if 0
-/*
- * ladspa_browser.h - dialog to display information about installed LADSPA
- *                    plugins
- *
- * Copyright (c) 2006 Danny McRae <khjklujn/at/users.sourceforge.net>
- * 
- * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program (see COPYING); if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- */
-
-
-#ifndef _LADSPA_BROWSER_H
-#define _LADSPA_BROWSER_H
-
-#include "ladspa_manager.h"
-#ifdef LADSPA_SUPPORT
-
-#include "qt3support.h"
-
-#ifdef QT4
-
-#include <QtGui/QDialog>
-
-#else
-
-#include <qdialog.h>
-
-#endif
-
-#include "engine.h"
-
-class QComboBox;
-class QLabel;
-class QLineEdit;
-class QSlider;
-
-class tabBar;
-
-
-class ladspaBrowser : public QDialog, public engineObject
-{
-	Q_OBJECT
-public:
-	ladspaBrowser( engine * _engine );
-	virtual ~ladspaBrowser();
-
-	inline void labelWidget( QWidget * _w, const QString & _txt );
-
-public slots:
-	void showPorts( const ladspa_key_t & _key );
-	void displayHelp( void );
-	
-private:
-	tabBar * m_tabBar;
-
-} ;
-
-#endif
-
-#endif
-
-#endif
-

include/ladspa_port_dialog.h

@@ -1,47 +0,0 @@
-/*
- * ladspa_port_dialog.h - dialog to test a LADSPA plugin
- *
- * Copyright (c) 2006-2007 Danny McRae <khjklujn/at/users.sourceforge.net>
- * 
- * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program (see COPYING); if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef _LADSPA_PORT_DIALOG_H
-#define _LADSPA_PORT_DIALOG_H
-
-#include <QtGui/QDialog>
-
-#include "ladspa_2_lmms.h"
-
-
-class ladspaPortDialog : public QDialog
-{
-	Q_OBJECT
-public:
-	ladspaPortDialog( const ladspa_key_t & _key );
-	virtual ~ladspaPortDialog();
-
-private:
-	ladspa_key_t m_key;
-	ladspa2LMMS * m_ladspa;
-
-};
-
-#endif
-

include/track_container.h

@@ -54,12 +54,6 @@ public:
 		return( m_scrollArea );
 	}
 
-#warning centralWidget is obsolete
-	QWidget * centralWidget( void ) const
-	{
-		return( (QWidget *) this );
-	}
-
 	virtual void FASTCALL saveSettings( QDomDocument & _doc,
 							QDomElement & _parent );
 

plugins/Makefile.am

@@ -2,10 +2,6 @@ if VST_SUPPORT
 VST_DIRS=vst_base vst_effect vestige
 endif
 
-if LADSPA_SUPPORT
-LADSPA_DIRS=ladspa_effect
-endif
-
 if STK_SUPPORT
 STK_DIR=stk
 endif
@@ -20,7 +16,8 @@ SUBDIRS =			\
 	bit_invader		\
 	flp_import		\
 	kicker			\
-	$(LADSPA_DIRS)		\
+	ladspa_browser		\
+	ladspa_effect		\
 	lb302 			\
 	live_tool		\
 	midi_import		\

plugins/ladspa_effect/ladspa_subplugin_features.cpp

@@ -67,8 +67,7 @@ void ladspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent,
 	maker_content->setText( lm->getMaker( lkey ) );
 	maker_content->setWordWrap( TRUE );
 	l->addWidget( maker_label );
-	l->addWidget( maker_content );
-	l->setStretchFactor( maker_content, 100 );
+	l->addWidget( maker_content, 1 );
 
 	QWidget * copyright = new QWidget( _parent );
 	l = new QHBoxLayout( copyright );
@@ -84,8 +83,7 @@ void ladspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent,
 	copyright_content->setText( lm->getCopyright( lkey ) );
 	copyright_content->setWordWrap( TRUE );
 	l->addWidget( copyright_label );
-	l->addWidget( copyright_content );
-	l->setStretchFactor( copyright_content, 100 );
+	l->addWidget( copyright_content, 1 );
 
 	QLabel * requiresRealTime = new QLabel( _parent );
 	requiresRealTime->setText( QWidget::tr( "Requires Real Time: " ) +

plugins/live_tool/live_tool.cpp

@@ -60,6 +60,13 @@ plugin::descriptor live_tool_plugin_descriptor =
 	NULL
 } ;
 
+
+// neccessary for getting instance out of shared lib
+plugin * lmms_plugin_main( void * _data )
+{
+	return( new liveTool );
+}
+
 }
 
 
@@ -76,7 +83,7 @@ liveTool::liveTool( void ) :
 	setPalette( pal );
 	setFixedSize( background.size() );
 
-	setWhatsThis( tr( 
+	setWhatsThis( tr(
 		"This tool is intended to be used in live performances, though "
 		"you can use it for music production as well.\n"
 		"The following keys will work only if this window is active.\n"
@@ -183,13 +190,4 @@ void liveTool::toggleInstrument( int _n )
 
 
 
-extern "C"
-{
-
-// neccessary for getting instance out of shared lib
-plugin * lmms_plugin_main( void * _data )
-{
-	return( new liveTool() );
-}
-
-}
+#include "live_tool.moc"

plugins/live_tool/live_tool.h

@@ -34,6 +34,7 @@
 
 class liveTool : public tool
 {
+	Q_OBJECT
 public:
 	liveTool( void );
 	virtual ~liveTool();