bug-fixes, compatibility-patches, ... see ChangeLog for details

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

include/arp_and_chords_tab_widget.h

@@ -95,7 +95,6 @@ public:
 
 
 protected slots:
-//	void arpOffToggled( bool );
 	void arpUpToggled( bool );
 	void arpDownToggled( bool );
 	void arpUpAndDownToggled( bool );
@@ -127,7 +126,7 @@ private:
 	knob * m_arpTimeKnob;
 	knob * m_arpGateKnob;
 	QLabel * m_arpDirectionLbl;
-	//pixmapButton * m_arpOffBtn;
+
 	pixmapButton * m_arpUpBtn;
 	pixmapButton * m_arpDownBtn;
 	pixmapButton * m_arpUpAndDownBtn;
@@ -135,4 +134,5 @@ private:
 
 } ;
 
+
 #endif

include/audio_oss.h

@@ -25,10 +25,18 @@
 #ifndef _AUDIO_OSS_H
 #define _AUDIO_OSS_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if defined HAVE_SYS_SOUNDCARD_H || defined HAVE_SOUNDCARD_H
+
+#define OSS_SUPPORT
+
+
 #include "audio_device.h"
 #include "tab_widget.h"
 
-#define OSS_SUPPORT
 
 
 class lcdSpinBox;
@@ -76,4 +84,6 @@ private:
 } ;
 
 
+#endif
+
 #endif

include/knob.h

@@ -42,9 +42,6 @@
 #endif
 
 
-#include "templates.h"
-
-
 class QPixmap;
 class textFloat;
 

include/midi_mapper.h

@@ -34,6 +34,7 @@
 
 #else
 
+#include <qmap.h>
 #include <qpair.h>
 #include <qfile.h>
 

include/midi_oss.h

@@ -25,6 +25,11 @@
 #ifndef _MIDI_OSS_H
 #define _MIDI_OSS_H
 
+#include "audio_oss.h"
+
+#ifdef OSS_SUPPORT
+
+
 #include <qthread.h>
 #include <qfile.h>
 
@@ -75,5 +80,7 @@ private:
 
 } ;
 
+#endif
+
 
 #endif

include/oscillator.h

@@ -104,7 +104,11 @@ public:
 	}
 	static inline float phase( float _sample )
 	{
+#ifndef modff
 		float t;
+#else
+		double t;
+#endif
 		return( modff( _sample, &t ) );
 		//return( _sample - floorf( _sample ) );
 	}

include/qt3support.h

@@ -170,6 +170,35 @@ typedef int csize;
 
 typedef unsigned int csize;
 
+// some compat-stuff for older qt-versions...
+#if QT_VERSION < 0x030100
+
+#define wasCanceled wasCancelled
+
+#include <qmutex.h>
+
+// Qt 3.0.x doesn't have QMutexLocker, so we implement it on our own...
+class QMutexLocker
+{
+public:
+	QMutexLocker( QMutex * _m ) :
+		m_mutex( _m )
+	{
+		m_mutex->lock();
+	}
+	~QMutexLocker()
+	{
+		m_mutex->unlock();
+	}
+
+private:
+    QMutex * m_mutex;
+
+} ;
+
+
+#endif
+
 
 #endif
 

include/templates.h

@@ -30,14 +30,10 @@
 #ifdef QT4
 
 #include <QtAlgorithms>
-#include <QX11Info>
-#include <QFont>
 
 #else
 
 #include <qtl.h>
-#include <qpaintdevice.h>
-#include <qfont.h>
 
 #endif
 
@@ -86,17 +82,4 @@ inline T tLimit( const T & x, const T & x1, const T & x2 )
 }
 
 
-template<int SIZE>
-inline QFont pointSize( QFont _f )
-{
-	const int DPI = 96;
-#ifdef QT4
-	_f.setPointSizeF( SIZE * DPI / QX11Info::appDpiX() );
-#else
-	_f.setPointSizeFloat( SIZE * DPI / QPaintDevice::x11AppDpiX() );
-#endif
-	return( _f );
-}
-
-
 #endif

include/tooltip.h

@@ -34,7 +34,6 @@ namespace toolTip
 {
 
 	void add( QWidget * _w, const QString & _txt );
-	//void remove( QWidget * _w );
 
 } ;