Merge remote-tracking branch 'upstream/stable-1.2'

# Conflicts:
#	data/themes/default/style.css
#	src/gui/ExportProjectDialog.cpp
#	src/tracks/Pattern.cpp

src/core/EnvelopeAndLfoParameters.cpp

@@ -293,6 +293,8 @@ void EnvelopeAndLfoParameters::fillLevel( float * _buf, f_cnt_t _frame,
 						const f_cnt_t _release_begin,
 						const fpp_t _frames )
 {
+	QMutexLocker m(&m_paramMutex);
+
 	if( _frame < 0 || _release_begin < 0 )
 	{
 		return;
@@ -404,6 +406,8 @@ void EnvelopeAndLfoParameters::loadSettings( const QDomElement & _this )
 
 void EnvelopeAndLfoParameters::updateSampleVars()
 {
+	QMutexLocker m(&m_paramMutex);
+
 	const float frames_per_env_seg = SECS_PER_ENV_SEGMENT *
 				Engine::mixer()->processingSampleRate();
 

src/gui/AutomationPatternView.cpp

@@ -265,7 +265,10 @@ void AutomationPatternView::paintEvent( QPaintEvent * )
 
 	lingrad.setColorAt( 1, c.darker( 300 ) );
 	lingrad.setColorAt( 0, c );
-	
+
+	// paint a black rectangle under the pattern to prevent glitches with transparent backgrounds
+	p.fillRect( rect(), QColor( 0, 0, 0 ) );
+
 	if( gradient() )
 	{
 		p.fillRect( rect(), lingrad );
@@ -482,8 +485,3 @@ void AutomationPatternView::scaleTimemapToFit( float oldMin, float oldMax )
 
 	m_pat->generateTangents();
 }
-
-
-
-
-

src/gui/ExportProjectDialog.cpp

@@ -206,6 +206,7 @@ void ExportProjectDialog::startExport()
 	}
 }
 
+
 void ExportProjectDialog::onFileFormatChanged(int index)
 {
 	// Extract the format tag from the currently selected item,

src/tracks/BBTrack.cpp

@@ -240,7 +240,10 @@ void BBTCOView::paintEvent( QPaintEvent * )
 	
 	lingrad.setColorAt( 0, c.light( 130 ) );
 	lingrad.setColorAt( 1, c.light( 70 ) );
-	
+
+	// paint a black rectangle under the pattern to prevent glitches with transparent backgrounds
+	p.fillRect( rect(), QColor( 0, 0, 0 ) );
+
 	if( gradient() )
 	{
 		p.fillRect( rect(), lingrad );

src/tracks/Pattern.cpp

@@ -891,6 +891,9 @@ void PatternView::paintEvent( QPaintEvent * )
 	lingrad.setColorAt( beatPattern ? 0 : 1, c.darker( 300 ) );
 	lingrad.setColorAt( beatPattern ? 1 : 0, c );
 
+	// paint a black rectangle under the pattern to prevent glitches with transparent backgrounds
+	p.fillRect( rect(), QColor( 0, 0, 0 ) );
+
 	if( gradient() )
 	{
 		p.fillRect( rect(), lingrad );
@@ -1129,7 +1132,7 @@ void PatternView::paintEvent( QPaintEvent * )
 		paintTextLabel(m_pat->name(), p);
 	}
 
-	if( !beatPattern )
+	if( !( fixedTCOs() && beatPattern ) )
 	{
 		// inner border
 		p.setPen( c.lighter( current ? 160 : 130 ) );

src/tracks/SampleTrack.cpp

@@ -478,6 +478,9 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
 	lingrad.setColorAt( 1, c.darker( 300 ) );
 	lingrad.setColorAt( 0, c );
 
+	// paint a black rectangle under the pattern to prevent glitches with transparent backgrounds
+	p.fillRect( rect(), QColor( 0, 0, 0 ) );
+
 	if( gradient() )
 	{
 		p.fillRect( rect(), lingrad );