Merge branch 'stable-1.2'

# Conflicts:
#	.travis.yml
#	.travis/linux..script.sh
#	.travis/linux.win32.script.sh
#	.travis/linux.win64.script.sh
#	.travis/osx..install.sh
#	.travis/osx..script.sh
#	data/locale/en.ts
#	data/locale/id.ts
#	include/Graph.h
#	include/VstSyncController.h
#	include/lmms_math.h
#	plugins/vst_base/RemoteVstPlugin.cpp
#	src/core/RemotePlugin.cpp
#	src/core/Song.cpp
#	src/core/Track.cpp
#	src/gui/SubWindow.cpp
#	src/gui/widgets/Graph.cpp

include/AudioPortAudio.h

@@ -34,6 +34,7 @@ class AudioPortAudioSetupUtil : public QObject
 {
 	Q_OBJECT
 public slots:
+	void updateBackends();
 	void updateDevices();
 	void updateChannels();
 
@@ -87,6 +88,7 @@ public:
 		virtual ~setupWidget();
 
 		virtual void saveSettings();
+		virtual void show();
 
 	private:
 		ComboBox * m_backend;

include/Graph.h

@@ -169,6 +169,7 @@ public slots:
 	void invert();
 	void shiftPhase( int _deg );
 	void clear();
+	void clearInvisible();
 
 signals:
 	void lengthChanged();

include/InstrumentPlayHandle.h

@@ -42,14 +42,7 @@ public:
 
 	virtual void play( sampleFrame * _working_buffer )
 	{
-		// if the instrument is midi-based, we can safely render right away
-		if( m_instrument->flags() & Instrument::IsMidiBased )
-		{
-			m_instrument->play( _working_buffer );
-			return;
-		}
-		
-		// if not, we need to ensure that all our nph's have been processed first
+		// ensure that all our nph's have been processed first
 		ConstNotePlayHandleList nphv = NotePlayHandle::nphsOfInstrumentTrack( m_instrument->instrumentTrack(), true );
 		
 		bool nphsLeft;

include/MixHelpers.h

@@ -33,6 +33,10 @@ namespace MixHelpers
 
 bool isSilent( const sampleFrame* src, int frames );
 
+bool useNaNHandler();
+
+void setNaNHandler( bool use );
+
 bool sanitize( sampleFrame * src, int frames );
 
 /*! \brief Add samples from src to dst */

include/Model.h

@@ -41,6 +41,10 @@ public:
 		m_displayName( _display_name ),
 		m_defaultConstructed( _default_constructed )
 	{
+#if QT_VERSION < 0x050000
+		connect( this, SIGNAL( dataChanged() ), this,
+			SLOT( thisDataChanged() ), Qt::DirectConnection );
+#endif
 	}
 
 	virtual ~Model()
@@ -85,6 +89,19 @@ signals:
 	// emitted if properties of the model (e.g. ranges) have changed
 	void propertiesChanged();
 
+#if QT_VERSION < 0x050000
+	// emitted along with dataChanged(), but with this model as an argument
+	// workaround for when QObject::sender() and Qt5 are unavailable
+	void dataChanged( Model * );
+
+private slots:
+	void thisDataChanged()
+	{
+		emit dataChanged( this );
+	}
+
+signals:
+#endif
 } ;
 
 

include/ProjectJournal.h

@@ -77,6 +77,7 @@ public:
 	}
 
 	static jo_id_t idToSave( jo_id_t id );
+	static jo_id_t idFromSave( jo_id_t id );
 
 	void clearJournal();
 	void stopAllJournalling();

include/RemotePlugin.h

@@ -754,9 +754,15 @@ public:
 	ProcessWatcher( RemotePlugin * );
 	virtual ~ProcessWatcher() = default;
 
-	void quit()
+	void stop()
 	{
 		m_quit = true;
+		quit();
+	}
+
+	void reset()
+	{
+		m_quit = false;
 	}
 
 private:
@@ -862,6 +868,9 @@ private:
 	QProcess m_process;
 	ProcessWatcher m_watcher;
 
+	QString m_exec;
+	QStringList m_args;
+
 	QMutex m_commMutex;
 	bool m_splitChannels;
 #ifdef USE_QT_SHMEM

include/SetupDialog.h

@@ -138,6 +138,7 @@ private:
 	bool m_MMPZ;
 	bool m_disableBackup;
 	bool m_openLastProject;
+	bool m_NaNHandler;
 	bool m_hqAudioDev;
 	QString m_lang;
 	QStringList m_languages;

include/SongEditor.h

@@ -159,6 +159,7 @@ public:
 
 protected:
 	virtual void resizeEvent( QResizeEvent * event );
+	virtual void changeEvent( QEvent * );
 
 protected slots:
 	void play();

include/SubWindow.h

@@ -92,7 +92,6 @@ private:
 	bool m_hasFocus;
 
 	static void elideText( QLabel *label, QString text );
-	bool isMaximized();
 	void adjustTitleBar();
 
 private slots:

include/VstSyncController.h

@@ -39,7 +39,7 @@ public:
 	VstSyncController();
 	~VstSyncController();
 
-	void setAbsolutePosition( int ticks );
+	void setAbsolutePosition( double ticks );
 
 	void setPlaybackState( bool enabled )
 	{

include/VstSyncData.h

@@ -42,7 +42,7 @@
 struct VstSyncData
 {
 	bool isPlaying;
-	float ppqPos;
+	double ppqPos;
 	int timeSigNumer;
 	int timeSigDenom;
 	bool isCycle;