Silence warnings for expected invalid keys.

This fixes lp1942350 a regression from mixxxdj#4229
daschuer · Sep 1, 2021 · 70fac19 · 70fac19
1 parent 6f4fc8e
commit 70fac19
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/control/control.cpp b/src/control/control.cpp
@@ -134,9 +134,11 @@ QSharedPointer<ControlDoublePrivate> ControlDoublePrivate::getControl(
         bool bPersist,
         double defaultValue) {
     if (!key.isValid()) {
-        qWarning() << "ControlDoublePrivate::getControl returning nullptr"
-                   << "for invalid ConfigKey" << key;
-        DEBUG_ASSERT(flags.testFlag(ControlFlag::AllowInvalidKey));
+        if (!flags.testFlag(ControlFlag::AllowInvalidKey)) {
+            qWarning() << "ControlDoublePrivate::getControl returning nullptr"
+                       << "for invalid ConfigKey" << key;
+            DEBUG_ASSERT(!"Unexpected invalid key");
+        }
         return nullptr;
     }
 

diff --git a/src/control/controlpotmeter.cpp b/src/control/controlpotmeter.cpp
@@ -15,6 +15,7 @@ ControlPotmeter::ControlPotmeter(const ConfigKey& key,
         double defaultValue)
         : ControlObject(key, bIgnoreNops, bTrack, bPersist, defaultValue),
           m_controls(key) {
+    qDebug() << "111" << key;
     setRange(dMinValue, dMaxValue, allowOutOfBounds);
     double default_value = dMinValue + 0.5 * (dMaxValue - dMinValue);
     setDefaultValue(default_value);
@@ -65,6 +66,8 @@ PotmeterControls::PotmeterControls(const ConfigKey& key)
     // PotmeterControls is a member variable of the associated ControlPotmeter
     // and the push-button controls are parented to the PotmeterControls.
 
+    qDebug() << "xxxx" << key;
+
     ControlPushButton* controlUp = new ControlPushButton(
         ConfigKey(key.group, QString(key.item) + "_up"));
     controlUp->setParent(this);

diff --git a/src/engine/enginemaster.cpp b/src/engine/enginemaster.cpp
@@ -74,7 +74,9 @@ EngineMaster::EngineMaster(
     m_pMasterLatency = new ControlObject(ConfigKey(group, "latency"), true, true);
     m_pMasterAudioBufferSize = new ControlObject(ConfigKey(group, "audio_buffer_size"));
     m_pAudioLatencyOverloadCount = new ControlObject(ConfigKey(group, "audio_latency_overload_count"), true, true);
+    qDebug() << "000" << group;
     m_pAudioLatencyUsage = new ControlPotmeter(ConfigKey(group, "audio_latency_usage"), 0.0, 0.25);
+    qDebug() << "222" << group;
     m_pAudioLatencyOverload  = new ControlPotmeter(ConfigKey(group, "audio_latency_overload"), 0.0, 1.0);
 
     // Master sync controller