Merge branch 'stable-1.2'

plugins/carlabase/carla.h

@@ -25,6 +25,8 @@
 #ifndef CARLA_H
 #define CARLA_H
 
+#include <QtCore/QMutex>
+
 #include "CarlaNative.h"
 
 #include "Instrument.h"

plugins/monstro/Monstro.cpp

@@ -1692,6 +1692,8 @@ QWidget * MonstroView::setupOperatorsView( QWidget * _parent )
 	makeknob( m_osc3SpoKnob, KNOBCOL4, O3ROW, tr( "Stereo phase offset" ), tr( " deg" ), "osc3Knob" )
 	makeknob( m_osc3SubKnob, KNOBCOL5, O3ROW, tr( "Sub-osc mix" ), "", "osc3Knob" )
 
+	m_osc3VolKnob -> setVolumeKnob( true );
+
 	m_osc3Wave1Box = new ComboBox( view );
 	m_osc3Wave1Box -> setGeometry( 160, O3ROW + 7, 42, 22 );
 	m_osc3Wave1Box->setFont( pointSize<8>( m_osc3Wave1Box->font() ) );