Fix knob linking / refactor linking

include/AutomatableModel.h

@@ -78,8 +78,6 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 {
 	Q_OBJECT
 public:
-	using AutoModelVector = std::vector<AutomatableModel*>;
-
 	enum class ScaleType
 	{
 		Linear,
@@ -151,22 +149,12 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 	template<class T>
 	inline T value( int frameOffset = 0 ) const
 	{
-		if (m_controllerConnection)
-		{
-			if (!m_useControllerValue)
-			{
-				return castValue<T>(m_value);
-			}
-			else
-			{
-				return castValue<T>(controllerValue(frameOffset));
-			}
-		}
-		else if (hasLinkedModels())
+		if (m_controllerConnection && m_useControllerValue)
 		{
-			return castValue<T>( controllerValue( frameOffset ) );
+			// workaround to update linked models
+			AutomatableModel* thisModel = const_cast<AutomatableModel*>(this);
+			thisModel->setValue(controllerValue(frameOffset));
 		}
-
 		return castValue<T>( m_value );
 	}
 
@@ -212,8 +200,8 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 
 	void setInitValue( const float value );
 
-	void setAutomatedValue( const float value );
-	void setValue( const float value );
+	void setAutomatedValue(float value);
+	void setValue(float value, bool isAutomated = false);
 
 	void incValue( int steps )
 	{
@@ -252,9 +240,9 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 
 	//! link @p m1 and @p m2, let @p m1 take the values of @p m2
 	static void linkModels( AutomatableModel* m1, AutomatableModel* m2 );
-	static void unlinkModels( AutomatableModel* m1, AutomatableModel* m2 );
-
 	void unlinkAllModels();
+	//! @return 0 if not connected, never 1, 2 if connected to 1 model
+	size_t countLinks() const;
 
 	/**
 	 * @brief Saves settings (value, automation links and controller connections) of AutomatableModel into
@@ -277,9 +265,9 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 
 	virtual QString displayValue( const float val ) const = 0;
 
-	bool hasLinkedModels() const
+	constexpr bool hasLinkedModels() const
 	{
-		return !m_linkedModels.empty();
+		return m_nextLink != nullptr;
 	}
 
 	// a way to track changed values in the model and avoid using signals/slots - useful for speed-critical code.
@@ -312,7 +300,7 @@ class LMMS_EXPORT AutomatableModel : public Model, public JournallingObject
 		s_periodCounter = 0;
 	}
 
-	bool useControllerValue()
+	bool useControllerValue() const
 	{
 		return m_useControllerValue;
 	}
@@ -340,6 +328,7 @@ public slots:
 
 
 private:
+	void setValueInternal(float value, bool isAutomated);
 	// dynamicCast implementation
 	template<class Target>
 	struct DCastVisitor : public ModelVisitor
@@ -368,9 +357,14 @@ public slots:
 		loadSettings( element, "value" );
 	}
 
-	void linkModel( AutomatableModel* model );
-	void unlinkModel( AutomatableModel* model );
-
+	void linkModel(AutomatableModel* model);
+	void unlinkModel();
+	//! linking is stored in a linked list ring
+	//! @return the model that's `m_nextLink` is `this`
+	AutomatableModel* getLastLinkedModel() const;
+	//! @return true if the `model` is in the linked list
+	bool isModelLinked(AutomatableModel* model) const;
+
 	//! @brief Scales @value from linear to logarithmic.
 	//! Value should be within [0,1]
 	template<class T> T logToLinearScale( T value ) const;
@@ -390,16 +384,15 @@ public slots:
 	float m_centerValue;
 
 	bool m_valueChanged;
-
-	// currently unused?
-	float m_oldValue;
-	int m_setValueDepth;
+	float m_oldValue; //!< used for interpolation
 
 	// used to determine if step size should be applied strictly (ie. always)
 	// or only when value set from gui (default)
 	bool m_hasStrictStepSize;
 
-	AutoModelVector m_linkedModels;
+	//! an `AutomatableModel` can be linked together with others in a linked list
+	//! the list has no end, the last model is connected to the first forming a ring
+	AutomatableModel* m_nextLink;
 
 
 	//! NULL if not appended to controller, otherwise connection info

plugins/Vestige/Vestige.cpp

@@ -1070,7 +1070,7 @@ void ManageVestigeInstrumentView::syncPlugin( void )
 			std::snprintf(paramStr.data(), paramStr.size(), "param%d", i);
 			s_dumpValues = dump[paramStr.data()].split(":");
 			float f_value = LocaleHelper::toFloat(s_dumpValues.at(2));
-			m_vi->knobFModel[ i ]->setAutomatedValue( f_value );
+			m_vi->knobFModel[ i ]->setValue(f_value, true);
 			m_vi->knobFModel[ i ]->setInitValue( f_value );
 		}
 	}

plugins/VstEffect/VstEffectControls.cpp

@@ -463,7 +463,7 @@ void ManageVSTEffectView::syncPlugin()
 			std::snprintf(paramStr.data(), paramStr.size(), "param%d", i);
 			s_dumpValues = dump[paramStr.data()].split(":");
 			float f_value = LocaleHelper::toFloat(s_dumpValues.at(2));
-			m_vi2->knobFModel[ i ]->setAutomatedValue( f_value );
+			m_vi2->knobFModel[ i ]->setValue(f_value, true);
 			m_vi2->knobFModel[ i ]->setInitValue( f_value );
 		}
 	}