Merge branch 'stable-1.2'

# Conflicts:
#       .circleci/config.yml
#       .travis/osx..install.sh
#       CMakeLists.txt
#       plugins/zynaddsubfx/zynaddsubfx
#       plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h
#       plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
#       plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
#       plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp
#       src/CMakeLists.txt
#       src/core/Track.cpp
#       src/tracks/Pattern.cpp

plugins/peak_controller_effect/peak_controller_effect.cpp

@@ -26,6 +26,7 @@
 
 #include "Controller.h"
 #include "Song.h"
+#include "PresetPreviewPlayHandle.h"
 #include "PeakController.h"
 #include "peak_controller_effect.h"
 #include "lmms_math.h"
@@ -67,7 +68,7 @@ PeakControllerEffect::PeakControllerEffect(
 	m_autoController( NULL )
 {
 	m_autoController = new PeakController( Engine::getSong(), this );
-	if( !Engine::getSong()->isLoadingProject() )
+	if( !Engine::getSong()->isLoadingProject() && !PresetPreviewPlayHandle::isPreviewing() )
 	{
 		Engine::getSong()->addController( m_autoController );
 	}

plugins/peak_controller_effect/peak_controller_effect_controls.cpp

@@ -29,7 +29,6 @@
 #include "PeakController.h"
 #include "peak_controller_effect_controls.h"
 #include "peak_controller_effect.h"
-#include "PresetPreviewPlayHandle.h"
 #include "Song.h"
 
 
@@ -81,12 +80,6 @@ void PeakControllerEffectControls::loadSettings( const QDomElement & _this )
 		// TODO: Fix possible collision
 		m_effect->m_effectId = rand();
 	}
-
-	if( m_effect->m_autoController && PresetPreviewPlayHandle::isPreviewing() == true )
-	{
-		delete m_effect->m_autoController;
-		m_effect->m_autoController = 0;
-	}
 }
 
 

plugins/sf2_player/sf2_player.cpp

@@ -114,6 +114,12 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
 		m_notesRunning[i] = 0;
 	}
 
+
+#if QT_VERSION_CHECK(FLUIDSYNTH_VERSION_MAJOR, FLUIDSYNTH_VERSION_MINOR, FLUIDSYNTH_VERSION_MICRO) >= QT_VERSION_CHECK(1,1,9)
+	// Deactivate all audio drivers in fluidsynth
+	const char *none[] = { NULL };
+	fluid_audio_driver_register( none );
+#endif
 	m_settings = new_fluid_settings();
 
 	//fluid_settings_setint( m_settings, (char *) "audio.period-size", engine::mixer()->framesPerPeriod() );

plugins/vst_base/CMakeLists.txt

@@ -49,6 +49,7 @@ SET(WINE_CXX_ARGS
 	-I${CMAKE_BINARY_DIR}
 	-I${CMAKE_SOURCE_DIR}/include
 	-I${WINE_INCLUDE_BASE_DIR}
+	-I${WINE_INCLUDE_DIR}/windows
 	-L${WINE_LIBRARY_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp
 	-std=c++0x

plugins/vst_base/RemoteVstPlugin.cpp

@@ -1450,7 +1450,6 @@ intptr_t RemoteVstPlugin::hostCallback( AEffect * _effect, int32_t _opcode,
 		case audioMasterAutomate:
 			SHOW_CALLBACK( "amc: audioMasterAutomate\n" );
 			// index, value, returns 0
-			_effect->setParameter( _effect, _index, _opt );
 			return 0;
 
 		case audioMasterVersion: