Qt4- and MinGW-compatibility

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@416 0778d3d1-df1d-0410-868b-ea421aaaa00d
2006-09-25 19:41:07 +00:00
parent 60abfb14d7
commit c0b1c47bd0
32 changed files with 225 additions and 57 deletions
--- a/36
+++ b/36
@@ -1,4 +1,12 @@
+2006-09-25	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* configure.in:
+	* plugins/ladspa_effect/Makefile.am:
+	* plugins/ladspa_effect/caps/Makefile.am:
+	added missing Makefile.am and re-added CAPS-support
+
 2006-09-25	Danny McRae <khjklujn/at/users/dot/sourceforge/dot/net>
+
 	* plugins/vibed/vibrating_string.cpp:
 	2x oversampling in non-hq-mode to get the instument to sound the
 	same in both modes
@@ -10,6 +18,34 @@

 2006-09-25	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>

+	* acinclude.m4:
+	* configure.in:
+	* Makefile.am:
+	* include/piano_roll.h:
+	* include/piano_widget.h:
+	* src/core/piano_roll.cpp:
+	* src/core/piano_widget.cpp:
+	made LMMS compile with mingw-cross-compiler
+
+	* include/automatable_slider.h:
+	* plugins/stk/mallets/mallets.cpp:
+	* plugins/vst_effect/vst_subplugin_features.cpp:
+	* plugins/vst_effect/vst_subplugin_features.cpp:
+	* src/core/meter_dialog.cpp:
+	* src/widgets/automatable_slider.cpp:
+	* src/widgets/knob.cpp:
+	* src/widgets/volume_knob.cpp:
+	Qt4-fixes
+
+	* plugins/audio_file_processor/audio_file_processor.cpp:
+	* src/lib/sample_buffer.cpp:
+	removed obsolete inclusion of paths.h
+
+	* include/rack_view.h:
+	* plugins/ladspa_effect/ladspa_effect.cpp:
+	* src/core/effect_control_dialog.cpp:
+	include qt3-support-header first
+
 	* plugins/vst_effect/vst_control_dialog.cpp:
 	do not try to reparent effect's plugin-widget in destructor - fixes
 	crash when deleting vst-effect from effect-chain
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,7 +117,7 @@ BUILT_SOURCES = $(lmms_MOC)
 lmms_EMBEDDED_RESOURCES = $(srcdir)/AUTHORS $(srcdir)/COPYING

 ./embedded_resources.h: $(lmms_EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(lmms_EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(lmms_EMBEDDED_RESOURCES) > $@

 ./embed.o: ./embedded_resources.h

@@ -390,7 +390,9 @@ 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_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)
+if BUILD_LINUX
 lmms_LDFLAGS = -rdynamic
+endif
 #-rpath $(pkglibdir)

--- a/acinclude.m4
+++ b/acinclude.m4
@@ -15,7 +15,7 @@ else
 	QTDIR=""
 fi
 for i in $QT_SEARCH ; do
-	QT_INCLUDE_SEARCH="include include/qt include/qt3 include/Qt"
+	QT_INCLUDE_SEARCH="include include/qt include/qt3 include/qt4/Qt include/Qt"
 	for j in $QT_INCLUDE_SEARCH ; do
 	        if test -f $i/$j/qglobal.h -a x$QTDIR = x ; then
 			QTDIR=$i
@@ -80,12 +80,17 @@ if test x"$QT_TRANSLATIONS" = x ; then
 fi
 AC_MSG_RESULT([$QT_TRANSLATIONS])

+QTHOSTDIR=/usr
+
 # Check that moc is in path
 AC_CHECK_PROG(MOC, moc, $QTDIR/bin/moc,,$QTDIR/bin/)
 if test x$MOC = x ; then
 	AC_CHECK_PROG(MOC, moc-qt3, $QTDIR/bin/moc-qt3,,$QTDIR/bin/)
 	if test x$MOC = x ; then
-        	AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools installed!])
+		AC_CHECK_PROG(MOC, moc-qt4, $QTHOSTDIR/bin/moc-qt4,,$QTHOSTDIR/bin/)
+		if test x$MOC = x ; then
+        		AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools installed!])
+		fi
 	fi
 fi

@@ -110,7 +115,7 @@ fi
 # Calculate Qt include path
 QT_CXXFLAGS="-I$QT_INCLUDES"
 if test "$QT_MAJOR" = "4" ; then
-	QT_CXXFLAGS="$QT_CXXFLAGS -I$QTDIR/include"
+	QT_CXXFLAGS="$QT_CXXFLAGS -I$QTDIR/include/qt4 -I$QTDIR/include"
 fi


@@ -138,6 +143,10 @@ case "${host}" in
        fi
        ;;

+      *mingw32)
+	QT_IS_MT="yes"
+	QT_LIB="-L$QTDIR/bin -lQtCore4 -lQtGui4 -lQtXml4 -lQt3Support4"
+        ;;
    *)
        QT_IS_STATIC=`ls $QTDIR/lib/*.a 2> /dev/null`
       	if test "x$QT_IS_STATIC" = x; then
@@ -261,7 +270,7 @@ fi

 if test x"$QT_IS_MT" = "xyes" ; then
        QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT"
-	QT_LIBS="$QT_LIBS -lpthread"
+	QT_LIBS="$QT_LIBS"
 fi

 if test x"$QT_TRANSLATIONS" != x ; then
--- a/configure.in
+++ b/configure.in
@@ -10,9 +10,45 @@ AM_CONFIG_HEADER(config.h)
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LN_S
 AC_PROG_GCC_TRADITIONAL
-AC_PROG_LIBTOOL
+AM_PROG_LIBTOOL
+
+CFLAGS="$CFLAGS -I${prefix}/include"
+CPPFLAGS="$CPPFLAGS -I${prefix}/include"
+LDFLAGS="$LDFLAGS -L${prefix}/bin"
+
+AH_TEMPLATE(BUILD_LINUX, [Build LMMS for Linux])
+AH_TEMPLATE(BUILD_WIN32, [Build LMMS for Win32])
+AC_ARG_WITH(linux,
+	[  --with-linux		explicit build iTALC for Linux], [ build_linux=true ], [ build_linux=false ])
+AC_ARG_WITH(win32,
+	[  --with-win32		explicit build iTALC for Win32], [ build_win32=true ], [ build_win32=false ])
+AC_MSG_CHECKING([platform to build for])
+if test "x$build_win32" = "xtrue" ; then
+	AC_MSG_RESULT([Win32, will enable support for it])
+	AC_DEFINE(BUILD_WIN32)
+	AC_DEFINE(WIN32)
+	#WIN32_DEFINES="-D_WIN32_WINNT=Windows2000"
+	#AC_SUBST(WIN32_DEFINES)
+	build_linux="false"
+	build_win32="true"
+else
+#	if test `uname -s | tr -s 'LINUX' 'linux'` = "linux" -o "x$build_linux" = "xyes" ; then
+		AC_MSG_RESULT([Linux, will enable support for it])
+		AC_DEFINE(BUILD_LINUX)
+		build_linux="true"
+		build_win32="false"
+#	if uname -s | grep MINGW32 ; then
+#	else
+#		AC_MSG_ERROR([*** non usable found... Run ./configure --help to see a list of available platforms, you can also specify explicit, if your platform was not recognized properly. Otherwise your platform isn't supported yet. In this case please contact the maintainer (see README)])
+	#fi
+fi
+
+AM_CONDITIONAL(BUILD_WIN32, test "$build_win32" = "true")
+AM_CONDITIONAL(BUILD_LINUX, test "$build_linux" = "true")
+

 # -fomit-frame-pointer crashes wine on Ubuntu Dapper--Danny 7/21/06
 #EXTRAFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las"
@@ -74,7 +110,7 @@ AH_TEMPLATE(SDL_SDL_AUDIO_H, [Define to location of SDL_audio.h])
 AH_TEMPLATE(SDL_SDL_SOUND_H, [Define to location of SDL_sound.h])

 OLD_LIBS="$LIBS"
-LIBS="$LIBS -lpthread"
+#LIBS="$LIBS -lpthread"

 # check for SDL-lib
 AC_ARG_WITH(sdl,
@@ -99,7 +135,7 @@ AC_ARG_WITH(sdlsound,
 	AS_HELP_STRING([--without-sdlsound],
 			[disable support for reading samples via SDL_sound]), ,
 	[ with_sdlsound=yes ])
-AH_TEMPLATE(HAVE_SDL_SDL_SOUND_H, [Define to 1 if you have the <$SDL_INCL_PATH/SDL_sound.h> header file.])
+AH_TEMPLATE(HAVE_SDL_SDL_SOUND_H, [Define to 1 if you have the <$SDL_INC_PATH/SDL_sound.h> header file.])
 if test "x$with_sdlsound" = "xyes" -a ! -z "$SDL_INC_PATH"; then
 	AC_CHECK_HEADER($SDL_INC_PATH/SDL_sound.h, HAVE_SDL_SDL_SOUND_H="true")
 	AC_CHECK_LIB([SDL_sound], [Sound_Init], HAVE_LIBSDL_SOUND="true", HAVE_SDL_SDL_SOUND_H="")
@@ -187,15 +223,17 @@ if test "x$with_vst" = "xyes" ; then
 	CFLAGS="$ORIG_CFLAGS"
 	CPPFLAGS="$ORIG_CPPFLAGS"

-	AC_CHECK_PROG(WINEGCC, winegcc, /usr/bin/winegcc,,/usr/bin)
-	AC_CHECK_LIB([wine], [wine_init])
-	if test ! -z "$WINEGCC" ; then
-		if test ! -z "$HAVE_VST_AEFFECTX_H" ; then
-			WINE_OK_BUT_VST_INCOMPLETE=""
-			AC_DEFINE(HAVE_VST_AEFFECTX_H)
-		else
-			WINE_OK_BUT_VST_INCOMPLETE="true"
-			WINEGCC=""
+	if test "$build_linux" = "true" ; then
+		AC_CHECK_PROG(WINEGCC, winegcc, /usr/bin/winegcc,,/usr/bin)
+		AC_CHECK_LIB([wine], [wine_init])
+		if test ! -z "$WINEGCC" ; then
+			if test ! -z "$HAVE_VST_AEFFECTX_H" ; then
+				WINE_OK_BUT_VST_INCOMPLETE=""
+				AC_DEFINE(HAVE_VST_AEFFECTX_H)
+			else
+				WINE_OK_BUT_VST_INCOMPLETE="true"
+				WINEGCC=""
+			fi
 		fi
 	fi
 	CC="$ORIG_CC"
@@ -444,6 +482,14 @@ else
 fi


+if [ "$build_win32" = "true" ] ; then
+	BIN2RES=`pwd`/buildtools/bin2res.exe
+else
+	BIN2RES=`pwd`/buildtools/bin2res
+fi
+AC_SUBST(BIN2RES)
+
+
 # check for rpm SOURCES path
 echo -n "checking for rpm sources path... "
 RPMSOURCEDIR="NOT-FOUND"
@@ -508,6 +554,7 @@ AC_CONFIG_FILES([Makefile
 		 plugins/flp_import/Makefile
 		 plugins/ladspa_base/Makefile
 		 plugins/ladspa_effect/Makefile
+		 plugins/ladspa_effect/caps/Makefile
 		 plugins/midi_import/Makefile
 		 plugins/organic/Makefile
 		 plugins/plucked_string_synth/Makefile
--- a/include/automatable_slider.h
+++ b/include/automatable_slider.h
@@ -68,6 +68,17 @@ public:
 		return( m_show_status );
 	}

+#ifdef QT3
+	inline int minimum( void ) const
+	{
+		return( minValue() );
+	}
+	inline int maximum( void ) const
+	{
+		return( maxValue() );
+	}
+#endif
+

 signals:
 	void logicValueChanged( int _value );
--- a/include/piano_roll.h
+++ b/include/piano_roll.h
@@ -105,7 +105,9 @@ protected:
 	virtual void paintEvent( QPaintEvent * _pe );
 	virtual void resizeEvent( QResizeEvent * _re );
 	virtual void wheelEvent( QWheelEvent * _we );
+#ifdef BUILD_LINUX
 	virtual bool x11Event( XEvent * _xe );
+#endif

 	int FASTCALL getKey( int _y );
 	static inline void drawNoteRect( QPainter & _p, Uint16 _x, Uint16 _y,
--- a/include/piano_widget.h
+++ b/include/piano_widget.h
@@ -81,8 +81,9 @@ public:

 	virtual void keyPressEvent( QKeyEvent * ke );
 	virtual void keyReleaseEvent( QKeyEvent * ke );
+#ifndef BUILD_WIN32
 	virtual bool x11Event( XEvent * _xe );
-
+#endif

 protected:
 	virtual void contextMenuEvent( QContextMenuEvent * _me );
--- a/include/rack_view.h
+++ b/include/rack_view.h
@@ -21,9 +21,12 @@
 * Boston, MA 02110-1301 USA.
 *
 */
+
 #ifndef _RACK_VIEW_H
 #define _RACK_VIEW_H

+#include "qt3support.h"
+
 #ifdef QT4

 #include <QtGui/QWidget>
--- a/plugins/audio_file_processor/Makefile.am
+++ b/plugins/audio_file_processor/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

@@ -26,7 +26,7 @@ CLEANFILES = $(MOC_FILES) ./embedded_resources.h



-pkglib_LTLIBRARIES= libaudiofileprocessor.la
+pkglib_LTLIBRARIES = libaudiofileprocessor.la

 libaudiofileprocessor_la_SOURCES = audio_file_processor.cpp audio_file_processor.h

--- a/plugins/audio_file_processor/audio_file_processor.cpp
+++ b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -49,7 +49,6 @@
 #include "song_editor.h"
 #include "instrument_track.h"
 #include "note_play_handle.h"
-#include "paths.h"
 #include "interpolation.h"
 #include "buffer_allocator.h"
 #include "pixmap_button.h"
--- a/plugins/bit_invader/Makefile.am
+++ b/plugins/bit_invader/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

@@ -26,7 +26,7 @@ CLEANFILES = $(MOC_FILES) ./embedded_resources.h



-pkglib_LTLIBRARIES= libbitinvader.la
+pkglib_LTLIBRARIES = libbitinvader.la

 libbitinvader_la_SOURCES = bit_invader.cpp bit_invader.h graph.cpp graph.h

--- a/plugins/ladspa_effect/Makefile.am
+++ b/plugins/ladspa_effect/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign 1.4

-#SUBDIRS = caps
+SUBDIRS = caps


 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib -I. -I../ladspa_base/
@@ -20,7 +20,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

--- a/plugins/ladspa_effect/caps/Makefile.am
+++ b/plugins/ladspa_effect/caps/Makefile.am
@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS = foreign 1.4
+
+
+AM_CXXFLAGS := $(AM_CXXFLAGS) -O6 -ffast-math -funroll-loops -ftracer
+
+DEST = $(libdir)/$(PACKAGE)/ladspa
+SOURCES = $(wildcard *.cc)
+HDRS = $(wildcard *.h) $(wildcard dsp/*.h)
+OBJECTS	= $(SOURCES:.cc=.o) 
+
+caps.so: $(OBJECTS) depend
+	$(CXX) -nostartfiles $(AM_CXXFLAGS) -shared -o $@ $(OBJECTS)
+
+clean:
+	rm -f *.o *.so *.s depend
+
+install: all
+	strip caps.so
+	install -d $(DEST)
+	install -m 644 caps.so $(DEST)
+
+uninstall:
+	-rm $(DEST)/caps.so
+
+depend: $(SOURCES)
+	$(CXX) -MM $(AM_CXXFLAGS) $(SOURCES) > depend
+
+.cc.o:
+	$(CXX) $(CXXFLAGS) $(AM_CXXFLAGS) -c $<
+
+all: caps.so
+
+EXTRA_DIST = $(SOURCES) $(HDRS)
--- a/plugins/ladspa_effect/ladspa_effect.cpp
+++ b/plugins/ladspa_effect/ladspa_effect.cpp
@@ -23,6 +23,8 @@
 */


+#include "qt3support.h"
+
 #ifdef QT4

 #include <QtGui/QMessageBox>
--- a/plugins/organic/Makefile.am
+++ b/plugins/organic/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

--- a/plugins/plucked_string_synth/Makefile.am
+++ b/plugins/plucked_string_synth/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

--- a/plugins/stk/mallets/Makefile.am
+++ b/plugins/stk/mallets/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

--- a/plugins/stk/mallets/mallets.cpp
+++ b/plugins/stk/mallets/mallets.cpp
@@ -111,9 +111,9 @@ void mallets::setWidgetBackground( QWidget * _widget, const QString & _pic )
 {
 #ifdef QT4
 	_widget->setAutoFillBackground( TRUE );
-	_widget->QPalette pal;
-	_widget->pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
-								_pic ) );
+	QPalette pal;
+	pal.setBrush( _widget->backgroundRole(),
+		PLUGIN_NAME::getIconPixmap( _pic.toAscii().constData() ) );
 	_widget->setPalette( pal );
 #else
 	_widget->setErasePixmap( PLUGIN_NAME::getIconPixmap( _pic ) );
@@ -125,7 +125,7 @@ void mallets::setWidgetBackground( QWidget * _widget, const QString & _pic )

 QWidget * mallets::setupModalBarControls( QWidget * _parent, track * _track )
 {
-	QWidget * widget = new QWidget( _parent, "ModalBar" );
+	QWidget * widget = new QWidget( _parent );
 	widget->setFixedSize( 250, 250 );
 		
 	m_hardness = new knob( knobBright_26, widget, tr( "Hardness" ),
@@ -176,7 +176,7 @@ QWidget * mallets::setupModalBarControls( QWidget * _parent, track * _track )

 QWidget * mallets::setupTubeBellControls( QWidget * _parent, track * _track )
 {
-	QWidget * widget = new QWidget( _parent, "TubeBellWidget" );
+	QWidget * widget = new QWidget( _parent );
 	widget->setFixedSize( 250, 250 );
 	
 	m_modulator = new knob( knobBright_26, widget, tr( "Modulator" ),
@@ -228,7 +228,7 @@ QWidget * mallets::setupTubeBellControls( QWidget * _parent, track * _track )
 QWidget * mallets::setupBandedWGControls( QWidget * _parent, track * _track )
 {
 	// BandedWG
-	QWidget * widget = new QWidget( _parent, "BandedWGWidget" );
+	QWidget * widget = new QWidget( _parent );
 	widget->setFixedSize( 250, 250 );
 	
 	m_strike = new ledCheckBox( tr( "Bowed" ), widget, tr( "Bowed" ),
@@ -520,7 +520,11 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 	try
 	{
 		Stk::setSampleRate( _sample_rate );
-		Stk::setRawwavePath( configManager::inst()->stkDir() );
+		Stk::setRawwavePath( configManager::inst()->stkDir()
+#ifndef QT3
+						.toAscii().constData()
+#endif
+									);
 	
 		m_voice = new ModalBar();
 	
@@ -566,7 +570,11 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 	try
 	{
 		Stk::setSampleRate( _sample_rate );
-		Stk::setRawwavePath( configManager::inst()->stkDir() );
+		Stk::setRawwavePath( configManager::inst()->stkDir()
+#ifndef QT3
+						.toAscii().constData()
+#endif
+									);
 	
 		m_voice = new TubeBell();
 	
@@ -610,8 +618,12 @@ malletsSynth::malletsSynth( const StkFloat _pitch,
 	try
 	{
 		Stk::setSampleRate( _sample_rate );
-		Stk::setRawwavePath( configManager::inst()->stkDir() );
-	
+		Stk::setRawwavePath( configManager::inst()->stkDir()
+#ifndef QT3
+						.toAscii().constData()
+#endif
+									);
+
 		m_voice = new BandedWG();
 	
 		m_voice->controlChange( 1, 128.0 );
--- a/plugins/triple_oscillator/Makefile.am
+++ b/plugins/triple_oscillator/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

--- a/plugins/vestige/Makefile.am
+++ b/plugins/vestige/Makefile.am
@@ -16,7 +16,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

--- a/plugins/vibed/Makefile.am
+++ b/plugins/vibed/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

--- a/plugins/vst_effect/Makefile.am
+++ b/plugins/vst_effect/Makefile.am
@@ -18,7 +18,7 @@ BUILT_SOURCES = $(MOC_FILES) ./embedded_resources.h
 EMBEDDED_RESOURCES = $(wildcard *png)

 ./embedded_resources.h: $(EMBEDDED_RESOURCES)
-	$(top_builddir)/buildtools/bin2res $(EMBEDDED_RESOURCES) > $@
+	$(BIN2RES) $(EMBEDDED_RESOURCES) > $@

 EXTRA_DIST = $(EMBEDDED_RESOURCES)

--- a/plugins/vst_effect/vst_control_dialog.cpp
+++ b/plugins/vst_effect/vst_control_dialog.cpp
@@ -47,7 +47,11 @@ vstControlDialog::vstControlDialog( QWidget * _parent,
 	QWidget * pw = m_effect->m_plugin->pluginWidget();
 	if( pw )
 	{
+#ifndef QT3
+		pw->setParent( this );
+#else
 		pw->reparent( this, QPoint( 0, 0 ) );
+#endif
 		pw->show();
 		l->addWidget( pw );
 	}
--- a/plugins/vst_effect/vst_subplugin_features.cpp
+++ b/plugins/vst_effect/vst_subplugin_features.cpp
@@ -90,7 +90,12 @@ void vstSubPluginFeatures::listSubPluginKeys( engine * _eng,
 				plugin::descriptor * _desc, keyList & _kl )
 {
 	QStringList dlls = QDir( configManager::inst()->vstDir() ).
+#ifndef QT3
+				entryList( QStringList() << "*.dll",
+						QDir::Files, QDir::Name );
+#else
 				entryList( "*.dll", QDir::Files, QDir::Name );
+#endif
 	// TODO: eval m_type
 	for( QStringList::const_iterator it = dlls.begin();
 							it != dlls.end(); ++it )
--- a/src/core/effect_control_dialog.cpp
+++ b/src/core/effect_control_dialog.cpp
@@ -26,6 +26,8 @@
 */


+#include "qt3support.h"
+
 #ifdef QT4

 #include <QtGui/QMessageBox>
--- a/src/core/meter_dialog.cpp
+++ b/src/core/meter_dialog.cpp
@@ -44,7 +44,7 @@


 meterDialog::meterDialog( QWidget * _parent, track * _track ):
-	QWidget( _parent, "meterDialog" )
+	QWidget( _parent )
 {
 	QVBoxLayout * vlayout = new QVBoxLayout( this );
 	vlayout->setSpacing( 5 );
--- a/src/core/piano_roll.cpp
+++ b/src/core/piano_roll.cpp
@@ -2670,7 +2670,7 @@ noteVector::iterator pianoRoll::noteIteratorUnderMouse( void )



-
+#ifdef BUILD_LINUX
 bool pianoRoll::x11Event( XEvent * _xe )
 {
 	if( validPattern() )
@@ -2680,7 +2680,7 @@ bool pianoRoll::x11Event( XEvent * _xe )
 	}
 	return( FALSE );
 }
-
+#endif



--- a/src/core/piano_widget.cpp
+++ b/src/core/piano_widget.cpp
@@ -724,6 +724,7 @@ void pianoWidget::loadSettings( const QDomElement & _this,



+#ifdef BUILD_LINUX
 bool pianoWidget::x11Event( XEvent * _xe )
 {
 	switch( _xe->type )
@@ -734,7 +735,7 @@ bool pianoWidget::x11Event( XEvent * _xe )
 	}
 	return( FALSE );
 }
-
+#endif



--- a/src/lib/sample_buffer.cpp
+++ b/src/lib/sample_buffer.cpp
@@ -83,7 +83,6 @@

 #include "sample_buffer.h"
 #include "interpolation.h"
-#include "paths.h"
 #include "templates.h"
 #include "config_mgr.h"
 #include "endian_handling.h"
--- a/src/widgets/automatable_slider.cpp
+++ b/src/widgets/automatable_slider.cpp
@@ -93,7 +93,7 @@ void automatableSlider::setRange( int _min, int _max )
 void automatableSlider::setValue( int _value )
 {
 	QSlider::setValue( _value );
-	m_knob->setValue( minValue() + maxValue() - _value );
+	m_knob->setValue( minimum() + maximum() - _value );
 }


@@ -102,7 +102,7 @@ void automatableSlider::setValue( int _value )
 void automatableSlider::setInitValue( int _value )
 {
 	m_knob->setInitValue( _value );
-	QSlider::setValue( minValue() + maxValue() - _value );
+	QSlider::setValue( minimum() + maximum() - _value );
 }


@@ -185,7 +185,7 @@ void automatableSlider::moveSlider( int _value )

 void automatableSlider::updateSlider( void )
 {
-	QSlider::setValue( minValue() + maxValue() - logicValue() );
+	QSlider::setValue( minimum() + maximum() - logicValue() );
 }


--- a/src/widgets/knob.cpp
+++ b/src/widgets/knob.cpp
@@ -250,7 +250,7 @@ void knob::valueChange( void )
 	recalcAngle();
 	update();
 	emit valueChanged( value() );
-	emit valueChanged( data() );
+	emit valueChanged( dynamic_cast<autoObj *>( this )->data() );
 }


@@ -490,7 +490,7 @@ void knob::mouseMoveEvent( QMouseEvent * _me )
 	{
 		setPosition( _me->pos() );
 		emit sliderMoved( value() );
-		emit valueChanged( data() );
+		emit valueChanged( dynamic_cast<autoObj *>( this )->data() );
 		if( !configManager::inst()->value( "knobs",
 						"classicalusability").toInt() )
 		{
@@ -605,7 +605,7 @@ void knob::wheelEvent( QWheelEvent * _we )
 	s_textFloat->setVisibilityTimeOut( 1000 );

 	emit sliderMoved( value() );
-	emit valueChanged( data() );
+	emit valueChanged( dynamic_cast<autoObj *>( this )->data() );
 }


@@ -614,7 +614,7 @@ void knob::wheelEvent( QWheelEvent * _we )
 void knob::buttonReleased( void )
 {
 	emit valueChanged( value() );
-	emit valueChanged( data() );
+	emit valueChanged( dynamic_cast<autoObj *>( this )->data() );
 }


--- a/src/widgets/volume_knob.cpp
+++ b/src/widgets/volume_knob.cpp
@@ -130,7 +130,7 @@ void volumeKnob::mouseMoveEvent( QMouseEvent * _me )
 	{
 		setPosition( _me->pos() );
 		emit sliderMoved( value() );
-		emit valueChanged( data() );
+		emit valueChanged( dynamic_cast<autoObj *>( this )->data() );
 		if( !configManager::inst()->value( "knobs",
 		     "classicalusability").toInt() )
 		{
@@ -182,7 +182,7 @@ void volumeKnob::wheelEvent( QWheelEvent * _we )
 	s_textFloat->setVisibilityTimeOut( 1000 );

 	emit sliderMoved( value() );
-	emit valueChanged( data() );
+	emit valueChanged( dynamic_cast<autoObj *>( this )->data() );
 }