Permalink
Browse files

vc/cue list: consider widget intensity on chaser actions

Otherwise submasters won't work
  • Loading branch information...
mcallegari committed Dec 9, 2018
1 parent c50b5fd commit 7638c3bc82a039bbaf262e4c0467466ad920e92a
@@ -678,13 +678,7 @@ int Chaser::adjustAttribute(qreal fraction, int attributeId)
QMutexLocker runnerLocker(&m_runnerMutex);
QMutexLocker stepListLocker(&m_stepListMutex);
if (m_runner != NULL)
{
m_runner->adjustStepIntensity(getAttributeValue(Function::Intensity));
}
else
{
m_startupAction.m_intensity = getAttributeValue(Intensity);
}
}

return attrIndex;
@@ -572,7 +572,8 @@ qreal VCCueList::getPrimaryIntensity() const
value = 1.0;
else
value = (qreal)((m_primaryLeft ? m_slider1 : m_slider2)->value()) / 100;
return value;

return value * intensity();
}

void VCCueList::notifyFunctionStarting(quint32 fid, qreal intensity)
@@ -988,14 +989,15 @@ void VCCueList::startChaser(int startIndex)
if (ch == NULL)
return;

adjustFunctionIntensity(ch, intensity());

ChaserAction action;
action.m_action = ChaserSetStepIndex;
action.m_stepIndex = startIndex;
action.m_intensity = getPrimaryIntensity();
action.m_fadeMode = getFadeMode();
ch->setAction(action);

adjustFunctionIntensity(ch, intensity());
ch->start(m_doc->masterTimer(), functionParent());
emit functionStarting(m_chaserID);
}
@@ -540,7 +540,7 @@ void VCWidget::adjustIntensity(qreal val)
m_intensity = val;
}

qreal VCWidget::intensity()
qreal VCWidget::intensity() const
{
return m_intensity;
}
@@ -373,7 +373,7 @@ class VCWidget : public QWidget
/** Set the widget intensity value. This is mostly used by submasters */
virtual void adjustIntensity(qreal val);

virtual qreal intensity();
virtual qreal intensity() const;

private:
qreal m_intensity;

0 comments on commit 7638c3b

Please sign in to comment.