AutomatableModel_fixing_issues

include/AutomatableModel.h

@@ -149,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_controllerConnection && m_useControllerValue)
 		{
-			if (!m_useControllerValue)
-			{
-				return castValue<T>(m_value);
-			}
-			else
-			{
-				return castValue<T>(controllerValue(frameOffset));
-			}
+			// workaround to update linked models
+			AutomatableModel* thisModel = const_cast<AutomatableModel*>(this);
+			thisModel->setValue(controllerValue(frameOffset));
 		}
-		else if (hasLinkedModels())
-		{
-			return castValue<T>( controllerValue( frameOffset ) );
-		}
-
 		return castValue<T>( m_value );
 	}
 
@@ -250,8 +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 );
-
 	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
@@ -338,7 +329,6 @@ public slots:
 
 private:
 	void setValueInternal(float value, bool isAutomated);
-	float controllerValueInternal(int frameOffset) const;
 	// dynamicCast implementation
 	template<class Target>
 	struct DCastVisitor : public ModelVisitor
@@ -374,8 +364,6 @@ public slots:
 	AutomatableModel* getLastLinkedModel() const;
 	//! @return true if the `model` is in the linked list
 	bool isModelLinked(AutomatableModel* model) const;
-	size_t countLinks() const;
-
 
 	//! @brief Scales @value from linear to logarithmic.
 	//! Value should be within [0,1]

src/core/AutomatableModel.cpp

@@ -321,11 +321,6 @@ void AutomatableModel::setValueInternal(float value, bool isAutomated)
 		m_valueChanged = true;
 		emit dataChanged();
 	}
-	else if (isAutomated == false)
-	{
-		// emit only if not automated and not changed
-		emit dataUnchanged();
-	}
 }
 
 
@@ -436,7 +431,7 @@ float AutomatableModel::fittedValue( float value ) const
 void AutomatableModel::linkModel(AutomatableModel* model)
 {
 	if (model == nullptr || model == this || isModelLinked(model)) { return; }
-	
+
 	AutomatableModel* otherEnd = model->getLastLinkedModel();
 	if (otherEnd == nullptr)
 	{
@@ -448,9 +443,6 @@ void AutomatableModel::linkModel(AutomatableModel* model)
 		otherEnd->m_nextLink = m_nextLink == nullptr ? this : m_nextLink;
 		m_nextLink = model;
 	}
-
-	QObject::connect(this, SIGNAL(dataChanged()),
-			model, SIGNAL(dataChanged()), Qt::DirectConnection);
 }
 
 void AutomatableModel::unlinkModel()
@@ -554,30 +546,6 @@ void AutomatableModel::setControllerConnection( ControllerConnection* c )
 
 
 float AutomatableModel::controllerValue( int frameOffset ) const
-{
-	float output = m_value;
-	if (hasLinkedModels())
-	{
-		const AutomatableModel* next = this;
-		while (true)
-		{
-			if (next->controllerConnection() != nullptr && next->useControllerValue())
-			{
-				output = next->fittedValue(controllerValueInternal(frameOffset));
-				break;
-			}
-			next = next->m_nextLink;
-			if (next == this) { break; }
-		}
-	}
-	else
-	{
-		output = fittedValue(controllerValueInternal(frameOffset));
-	}
-	return output;
-}
-
-float AutomatableModel::controllerValueInternal(int frameOffset) const
 {
 	if (m_controllerConnection == nullptr) { return m_value; }