Merge branch 'master' into calf-updates

plugins/ladspa_effect/LadspaControls.cpp

@@ -1,8 +1,8 @@
 /*
- * LadspaControls.cpp - model for LADSPA-plugin controls
+ * LadspaControls.cpp - model for LADSPA plugin controls
+ *
+ * Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
- * Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -22,7 +22,6 @@
  *
  */
 
-
 #include <QtXml/QDomElement>
 
 #include "LadspaEffect.h"
@@ -35,6 +34,10 @@ LadspaControls::LadspaControls( LadspaEffect * _eff ) :
 	m_noLink( false ),
 	m_stereoLinkModel( true, this )
 {
+
+	connect( &m_stereoLinkModel, SIGNAL( dataChanged() ),
+				this, SLOT( updateLinkStatesFromGlobal() ) );
+
 	multi_proc_t controls = m_effect->getPortControls();
 	m_controlCount = controls.count();
 
@@ -163,7 +166,7 @@ void LadspaControls::linkPort( Uint16 _port, bool _state )
 
 
 
-void LadspaControls::updateChannelLinkState()
+void LadspaControls::updateLinkStatesFromGlobal()
 {
 	if( m_stereoLinkModel.value() )
 	{
@@ -183,10 +186,10 @@ void LadspaControls::updateChannelLinkState()
 			m_controls[0][port]->setLink( false );
 		}
 	}
-	else
-	{
-		m_noLink = false;
-	}
+
+	// if global channel link state has changed, always ignore link
+	// status of individual ports in the future
+	m_noLink = false;
 }
 
 

plugins/ladspa_effect/LadspaControls.h

@@ -1,8 +1,8 @@
 /*
- * ladspa_controls.h - model for LADSPA-plugin controls
+ * LadspaControls.h - model for LADSPA plugin controls
+ *
+ * Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
- * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -61,7 +61,7 @@ public:
 
 
 protected slots:
-	void updateChannelLinkState();
+	void updateLinkStatesFromGlobal();
 	void linkPort( Uint16 _port, bool _state );
 
 

plugins/sf2_player/sf2_player.cpp

@@ -636,6 +636,7 @@ void sf2Instrument::playNote( notePlayHandle * _n, sampleFrame * )
 
 	SF2PluginData * pluginData = static_cast<SF2PluginData *>(
 							_n->m_pluginData );
+#ifdef SOMEONE_FIXED_PER_NOTE_PANNING
 	if( pluginData->fluidVoice &&
 			pluginData->lastPanning != _n->getPanning() )
 	{
@@ -650,6 +651,7 @@ void sf2Instrument::playNote( notePlayHandle * _n, sampleFrame * )
 
 		pluginData->lastPanning = _n->getPanning();
 	}
+#endif
 
 	const float currentVelocity = _n->volumeLevel( tfp ) * 127;
 	if( pluginData->fluidVoice &&

plugins/spectrum_analyzer/spectrum_analyzer.cpp

@@ -1,8 +1,8 @@
 /*
  * spectrum_analyzer.cpp - spectrum analyzer plugin
  *
- * Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
- * 
+ * Copyright (c) 2008-2010 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
  * This program is free software; you can redistribute it and/or
@@ -82,6 +82,11 @@ bool spectrumAnalyzer::processAudioBuffer( sampleFrame * _buf,
 		return( false );
 	}
 
+	if( !m_saControls.isViewVisible() )
+	{
+		return true;
+	}
+
 	fpp_t f = 0;
 	if( _frames > FFT_BUFFER_SIZE )
 	{