Fix knob linking / refactor linking #7883
- Loading branch information
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,7 +53,7 @@ AutomatableModel::AutomatableModel( | |
| m_valueChanged( false ), | ||
|
Comment on lines
53
to
55
This comment was marked as off-topic.
Sorry, something went wrong. |
||
| m_oldValue(val), | ||
| m_hasStrictStepSize( false ), | ||
| m_nextLink(this), | ||
| m_controllerConnection( nullptr ), | ||
| m_valueBuffer( static_cast<int>( Engine::audioEngine()->framesPerPeriod() ) ), | ||
| m_lastUpdatedPeriod( -1 ), | ||
|
Comment on lines
57
to
61
This comment was marked as off-topic.
Sorry, something went wrong. |
||
|
|
@@ -70,8 +70,7 @@ AutomatableModel::AutomatableModel( | |
|
|
||
| AutomatableModel::~AutomatableModel() | ||
| { | ||
| unlink(); | ||
|
|
||
| if (m_controllerConnection) | ||
| { | ||
|
|
@@ -290,33 +289,34 @@ void AutomatableModel::loadSettings( const QDomElement& element, const QString& | |
|
|
||
|
|
||
|
|
||
| void AutomatableModel::setValue(const float value, const bool isAutomated) | ||
| { | ||
| if (fittedValue(value) == m_value) | ||
| { | ||
| // TODO check why we need this signal, is there a better solution? | ||
| if (!isAutomated) { emit dataUnchanged(); } | ||
| return; | ||
| } | ||
|
|
||
| if (!isAutomated) { addJournalCheckPoint(); } | ||
|
|
||
| // set value for this and the other linked models | ||
| setValueInternal(value); | ||
| for (auto model = m_nextLink; model != this; model = model->m_nextLink) | ||
| { | ||
| model->setValueInternal(value); | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| void AutomatableModel::setValueInternal(const float value) | ||
|
szeli1 marked this conversation as resolved.
|
||
| { | ||
| m_oldValue = m_value; | ||
| m_value = fittedValue(value); | ||
|
messmerd marked this conversation as resolved.
|
||
|
|
||
| if (m_oldValue != m_value) | ||
| { | ||
| m_valueChanged = true; | ||
| emit dataChanged(); | ||
|
|
@@ -427,103 +427,67 @@ float AutomatableModel::fittedValue( float value ) const | |
|
|
||
|
|
||
|
|
||
| AutomatableModel* AutomatableModel::getLastLinkedModel() const | ||
| { | ||
| for (auto model = m_nextLink; ; model = model->m_nextLink) | ||
| { | ||
| // The last model in the circual reference links back to this | ||
|
szeli1 marked this conversation as resolved.
Outdated
|
||
| if (model->m_nextLink == this) { return model; } | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| bool AutomatableModel::isLinkedToModel(AutomatableModel* model) const | ||
| { | ||
| for (auto next = m_nextLink; ; next = next->m_nextLink) | ||
| { | ||
| if (next == model) { return true; } | ||
| if (next == this) { return false; } | ||
| } | ||
| } | ||
|
|
||
| size_t AutomatableModel::countLinks() const | ||
| { | ||
| size_t output = 0; | ||
| for (auto model = m_nextLink; model != this; model = model->m_nextLink) | ||
| { | ||
| output++; | ||
| } | ||
| return output; | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| void AutomatableModel::linkToModel(AutomatableModel* other) | ||
| { | ||
| if (isLinkedToModel(other)) { return; } | ||
|
|
||
| // copy data from other to this | ||
| setValue(other->m_value); | ||
| if (valueBuffer() && other->valueBuffer()) | ||
| { | ||
| std::copy_n(other->valueBuffer()->data(), | ||
| valueBuffer()->length(), | ||
| valueBuffer()->data()); | ||
| emit dataChanged(); | ||
|
Member
There was a problem hiding this comment. Previously this signal was emitted after this if-statement's body, not inside it.
Contributor
There was a problem hiding this comment. The call to
Contributor
Author
There was a problem hiding this comment.
Member
There was a problem hiding this comment. Ok, I see. If the value changes, Correct me if I'm wrong, but I believe that's still different from the previous behavior, since now 0, 1, or even 2 signals are emitted rather than just 1 signal. Here's an idea for how to solve it (assuming it's worth solving): First, make -void AutomatableModel::setValueInternal(const float value)
+bool AutomatableModel::setValueInternal(const float value)
{
m_oldValue = m_value;
m_value = fittedValue(value);
if (m_oldValue != m_value)
{
m_valueChanged = true;
- emit dataChanged();
+ return true;
}
+
+ return false;
}Then emit the signal from // set value for this and the other linked models
- setValueInternal(value);
+ const bool valueChanged = setValueInternal(value);
for (auto model = m_nextLink; model != this; model = model->m_nextLink)
{
- model->setValueInternal(value);
+ if (model->setValueInternal(value)) { emit model->dataChanged(); }
}
+
+ // emit signal *after* all values have been updated (just in case)
+ if (valueChanged) { emit dataChanged(); }(If there's no point in emitting the signal after the linked models have been updated, you could remove the Lastly, this method ( void AutomatableModel::linkToModel(AutomatableModel* other)
{
if (isLinkedToModel(other)) { return; }
addJournalCheckPoint();
// copy data from other to this
setValueInternal(other->m_value);
for (auto model = m_nextLink; model != this; model = model->m_nextLink)
{
if (model->setValueInternal(other->m_value)) { emit model->dataChanged(); }
}
if (valueBuffer() && other->valueBuffer())
{
std::copy_n(other->valueBuffer()->data(),
valueBuffer()->length(),
valueBuffer()->data());
}
// send dataChanged() before linking (because linking will
// connect the two dataChanged() signals)
emit dataChanged();
// link the models
AutomatableModel* thisEnd = getLastLinkedModel();
AutomatableModel* otherEnd = other->getLastLinkedModel();
thisEnd->m_nextLink = other;
otherEnd->m_nextLink = this;
}As you can see, this method is now like a version of
Contributor
There was a problem hiding this comment. @messmerd while your suggestion seems technically correct, I believe emitting void AmplifierEffect::processImpl(SampleFrame* outputFrameArray, int frameCount)
{
auto amplificationBuffer = amplificationModel.valueBuffer();
for (int f = 0; f < frameCount; ++f)
{
outputFrameArray[f] *= amplificationBuffer->value(f);
}
}Since the
Member
There was a problem hiding this comment. I think you're right. The best option is to just remove the |
||
| } | ||
| // link the models | ||
| AutomatableModel* thisEnd = getLastLinkedModel(); | ||
| AutomatableModel* otherEnd = other->getLastLinkedModel(); | ||
| thisEnd->m_nextLink = other; | ||
| otherEnd->m_nextLink = this; | ||
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| void AutomatableModel::unlink() | ||
| { | ||
| getLastLinkedModel()->m_nextLink = m_nextLink; | ||
| m_nextLink = this; | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -547,8 +511,6 @@ void AutomatableModel::setControllerConnection( ControllerConnection* c ) | |
|
|
||
| float AutomatableModel::controllerValue( int frameOffset ) const | ||
| { | ||
| float v = 0; | ||
| switch (m_scaleType) | ||
| { | ||
|
|
@@ -584,6 +546,7 @@ ValueBuffer * AutomatableModel::valueBuffer() | |
|
|
||
| float val = m_value; // make sure our m_value doesn't change midway | ||
|
|
||
| // Get value buffer from our controller | ||
| if (m_controllerConnection && m_useControllerValue && m_controllerConnection->getController()->isSampleExact()) | ||
| { | ||
| auto vb = m_controllerConnection->valueBuffer(); | ||
|
|
@@ -616,13 +579,11 @@ ValueBuffer * AutomatableModel::valueBuffer() | |
| } | ||
| } | ||
|
|
||
| // Get value buffer from one of the linked models' controller | ||
| if (m_useControllerValue) | ||
| { | ||
| for (auto next = m_nextLink; next != this; next = next->m_nextLink) | ||
| { | ||
| if (next->controllerConnection() && next->useControllerValue() && | ||
| next->controllerConnection()->getController()->isSampleExact()) | ||
| { | ||
|
|
@@ -637,12 +598,10 @@ ValueBuffer * AutomatableModel::valueBuffer() | |
| m_hasSampleExactData = true; | ||
| return &m_valueBuffer; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Populate value buffer by interpolatating between the old and new value | ||
| if (m_oldValue != val) | ||
| { | ||
| m_valueBuffer.interpolate(m_oldValue, val); | ||
|
|
@@ -754,16 +713,9 @@ float AutomatableModel::globalAutomationValueAt( const TimePos& time ) | |
|
|
||
| void AutomatableModel::setUseControllerValue(bool b) | ||
| { | ||
| if (m_useControllerValue == b) { return; } | ||
| m_useControllerValue = b; | ||
| if (m_controllerConnection) { emit dataChanged(); } | ||
| } | ||
|
|
||
| float FloatModel::getRoundedValue() const | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.