Merge branch 'master' into groove

include/AudioAlsa.h

@@ -38,9 +38,9 @@
 #include "AudioDevice.h"
 
 
-class AudioAlsa : public AudioDevice, public QThread
+class AudioAlsa : public QThread, public AudioDevice
 {
-	// Public classes and enums
+	Q_OBJECT
 public:
 	/**
 	 * @brief Contains the relevant information about available ALSA devices

include/AudioDummy.h

@@ -31,8 +31,9 @@
 #include "Mixer.h"
 
 
-class AudioDummy : public AudioDevice, public QThread
+class AudioDummy : public QThread, public AudioDevice
 {
+	Q_OBJECT
 public:
 	AudioDummy( bool & _success_ful, Mixer* mixer ) :
 		AudioDevice( DEFAULT_CHANNELS, mixer )

include/AudioOss.h

@@ -39,8 +39,9 @@ class LcdSpinBox;
 class QLineEdit;
 
 
-class AudioOss : public AudioDevice, public QThread
+class AudioOss : public QThread, public AudioDevice
 {
+	Q_OBJECT
 public:
 	AudioOss( bool & _success_ful, Mixer* mixer );
 	virtual ~AudioOss();

include/AudioPulseAudio.h

@@ -41,8 +41,9 @@ class LcdSpinBox;
 class QLineEdit;
 
 
-class AudioPulseAudio : public AudioDevice, public QThread
+class AudioPulseAudio : public QThread, public AudioDevice
 {
+	Q_OBJECT
 public:
 	AudioPulseAudio( bool & _success_ful, Mixer* mixer );
 	virtual ~AudioPulseAudio();

include/AudioSndio.h

@@ -40,8 +40,9 @@ class LcdSpinBox;
 class QLineEdit;
 
 
-class AudioSndio : public AudioDevice, public QThread
+class AudioSndio : public QThread, public AudioDevice
 {
+	Q_OBJECT
 public:
 	AudioSndio( bool & _success_ful, Mixer * _mixer );
 	virtual ~AudioSndio();

include/CaptionMenu.h

@@ -39,13 +39,6 @@ class EXPORT CaptionMenu : public QMenu
 public:
 	CaptionMenu( const QString & _title, QWidget * _parent = 0 );
 	virtual ~CaptionMenu();
-
-	///
-	/// \brief Adds a "Help" action displaying the Menu's parent's WhatsThis
-	///		   text when selected.
-	///
-	void addHelpAction();
-
 } ;
 
 

include/ControllerView.h

@@ -60,7 +60,6 @@ public:
 public slots:
 	void editControls();
 	void deleteController();
-	void displayHelp();
 	void closeControls();
 	void renameController();
 

include/EffectView.h

@@ -63,7 +63,6 @@ public slots:
 	void moveUp();
 	void moveDown();
 	void deletePlugin();
-	void displayHelp();
 	void closeEffects();
 
 

include/FxLine.h

@@ -107,7 +107,6 @@ private slots:
 	void removeUnusedChannels();
 	void moveChannelLeft();
 	void moveChannelRight();
-	void displayHelp();
 };
 
 

include/Knob.h

@@ -139,7 +139,6 @@ protected:
 
 private slots:
 	virtual void enterValue();
-	void displayHelp();
 	void friendlyUpdate();
 	void toggleScale();
 

include/MainWindow.h

@@ -29,7 +29,6 @@
 #include <QtCore/QTimer>
 #include <QtCore/QList>
 #include <QMainWindow>
-#include <QThread>
 
 #include "ConfigManager.h"
 #include "SubWindow.h"
@@ -148,7 +147,6 @@ public slots:
 	void resetWindowTitle();
 
 	void emptySlot();
-	void enterWhatsThisMode();
 	void createNewProject();
 	void createNewProjectFromTemplate( QAction * _idx );
 	void openProject();

include/MidiAlsaRaw.h

@@ -37,11 +37,11 @@
 
 
 struct pollfd;
-class QLineEdit;
 
 
-class MidiAlsaRaw : public MidiClientRaw , public QThread
+class MidiAlsaRaw : public QThread, public MidiClientRaw
 {
+	Q_OBJECT
 public:
 	MidiAlsaRaw();
 	virtual ~MidiAlsaRaw();

include/MidiAlsaSeq.h

@@ -39,7 +39,6 @@
 
 
 struct pollfd;
-class QLineEdit;
 
 
 class MidiAlsaSeq : public QThread, public MidiClient

include/MidiOss.h

@@ -35,11 +35,10 @@
 #include "MidiClient.h"
 
 
-class QLineEdit;
 
-
-class MidiOss : public MidiClientRaw, public QThread
+class MidiOss : public QThread, public MidiClientRaw
 {
+	Q_OBJECT
 public:
 	MidiOss();
 	virtual ~MidiOss();

include/MidiPort.h

@@ -124,6 +124,8 @@ public:
 		return m_writablePorts;
 	}
 
+	void invalidateCilent();
+
 	MidiPortMenu* m_readablePortsMenu;
 	MidiPortMenu* m_writablePortsMenu;
 

include/MidiSndio.h

@@ -37,11 +37,10 @@
 
 #include "MidiClient.h"
 
-class QLineEdit;
 
-
-class MidiSndio : public MidiClientRaw, public QThread
+class MidiSndio : public QThread, public MidiClientRaw
 {
+	Q_OBJECT
 public:
 	MidiSndio( void );
 	virtual ~MidiSndio();

include/MixerWorkerThread.h

@@ -35,6 +35,7 @@ class ThreadableJob;
 
 class MixerWorkerThread : public QThread
 {
+	Q_OBJECT
 public:
 	// internal representation of the job queue - all functions are thread-safe
 	class JobQueue
@@ -46,10 +47,10 @@ public:
 			Dynamic	// jobs can be added while processing queue
 		} ;
 
-#define JOB_QUEUE_SIZE 1024
+#define JOB_QUEUE_SIZE 8192
 		JobQueue() :
 			m_items(),
-			m_queueSize( 0 ),
+			m_writeIndex( 0 ),
 			m_itemsDone( 0 ),
 			m_opMode( Static )
 		{
@@ -65,7 +66,7 @@ public:
 
 	private:
 		std::atomic<ThreadableJob*> m_items[JOB_QUEUE_SIZE];
-		std::atomic_int m_queueSize;
+		std::atomic_int m_writeIndex;
 		std::atomic_int m_itemsDone;
 		OperationMode m_opMode;
 

include/Pattern.h

@@ -29,7 +29,6 @@
 #include <QtCore/QVector>
 #include <QWidget>
 #include <QDialog>
-#include <QtCore/QThread>
 #include <QPixmap>
 #include <QStaticText>
 

include/RemotePlugin.h

@@ -749,12 +749,10 @@ class RemotePlugin;
 
 class ProcessWatcher : public QThread
 {
+	Q_OBJECT
 public:
 	ProcessWatcher( RemotePlugin * );
-	virtual ~ProcessWatcher()
-	{
-	}
-
+	virtual ~ProcessWatcher() = default;
 
 	void quit()
 	{

include/SetupDialog.h

@@ -70,7 +70,6 @@ private slots:
 	// general settings widget
 	void setBufferSize( int _value );
 	void resetBufSize();
-	void displayBufSizeHelp();
 
 	// path settings widget
 	void setWorkingDir( const QString & _wd );
@@ -86,15 +85,12 @@ private slots:
 	// performance settings widget
 	void setAutoSaveInterval( int time );
 	void resetAutoSave();
-	void displaySaveIntervalHelp();
 
 	// audio settings widget
 	void audioInterfaceChanged( const QString & _driver );
-	void displayAudioHelp();
 
 	// MIDI settings widget
 	void midiInterfaceChanged( const QString & _driver );
-	void displayMIDIHelp();
 
 
 	void toggleToolTips( bool _enabled );