diff options
Diffstat (limited to 'src/controllers/controllerengine.cpp')
| -rw-r--r-- | src/controllers/controllerengine.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp index cc298e4f07..9ca07d0cc9 100644 --- a/src/controllers/controllerengine.cpp +++ b/src/controllers/controllerengine.cpp @@ -676,14 +676,14 @@ void ControllerEngine::setValue(QString group, QString name, double newValue) { ControlObjectScript* coScript = getControlObjectScript(group, name); if (coScript != nullptr) { - ControlObject* pControl = ControlObject::getControl(coScript->getKey()); + ControlObject* pControl = ControlObject::getControl( + coScript->getKey(), ControlFlag::NoAssertIfMissing); if (pControl && !m_st.ignore(pControl, coScript->getParameterForValue(newValue))) { coScript->slotSet(newValue); } } } - /* -------- ------------------------------------------------------ Purpose: Returns the normalized value of a Mixxx control (for scripts) Input: Control group (e.g. [Channel1]), Key name (e.g. [filterHigh]) @@ -713,7 +713,8 @@ void ControllerEngine::setParameter(QString group, QString name, double newParam ControlObjectScript* coScript = getControlObjectScript(group, name); if (coScript != nullptr) { - ControlObject* pControl = ControlObject::getControl(coScript->getKey()); + ControlObject* pControl = ControlObject::getControl( + coScript->getKey(), ControlFlag::NoAssertIfMissing); if (pControl && !m_st.ignore(pControl, newParameter)) { coScript->setParameter(newParameter); } @@ -1440,7 +1441,8 @@ bool ControllerEngine::isScratching(int deck) { Output: - -------- ------------------------------------------------------ */ void ControllerEngine::softTakeover(QString group, QString name, bool set) { - ControlObject* pControl = ControlObject::getControl(ConfigKey(group, name)); + ControlObject* pControl = ControlObject::getControl( + ConfigKey(group, name), ControlFlag::NoAssertIfMissing); if (!pControl) { return; } @@ -1460,8 +1462,10 @@ void ControllerEngine::softTakeover(QString group, QString name, bool set) { Input: ControlObject group and key values Output: - -------- ------------------------------------------------------ */ -void ControllerEngine::softTakeoverIgnoreNextValue(QString group, const QString name) { - ControlObject* pControl = ControlObject::getControl(ConfigKey(group, name)); +void ControllerEngine::softTakeoverIgnoreNextValue( + QString group, const QString name) { + ControlObject* pControl = ControlObject::getControl( + ConfigKey(group, name), ControlFlag::NoAssertIfMissing); if (!pControl) { return; } |