Merge pull request #13577 from fwcd/fix-rubberband-ifdefs

DlgPrefSound: Add missing ifdefs for building without Rubberband
mixxxdj · Aug 17, 2024 · d8cad8a · d8cad8a
2 parents 548d876 + d4535e5
commit d8cad8a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp
@@ -216,11 +216,11 @@ DlgPrefSound::DlgPrefSound(QWidget* pParent,
             QOverload<int>::of(&QComboBox::currentIndexChanged),
             this,
             &DlgPrefSound::settingChanged);
+#ifdef __RUBBERBAND__
     connect(keylockComboBox,
             QOverload<int>::of(&QComboBox::currentIndexChanged),
             this,
             &DlgPrefSound::updateKeylockDualThreadingCheckbox);
-#ifdef __RUBBERBAND__
     connect(keylockDualthreadedCheckBox,
             &QCheckBox::clicked,
             this,
@@ -365,7 +365,9 @@ void DlgPrefSound::slotApply() {
     m_bSkipConfigClear = true;
     loadSettings(); // in case SM decided to change anything it didn't like
     checkLatencyCompensation();
+#ifdef __RUBBERBAND__
     updateKeylockDualThreadingCheckbox();
+#endif
     m_bSkipConfigClear = false;
 }
 
@@ -749,10 +751,9 @@ void DlgPrefSound::settingChanged() {
         return; // doesn't count if we're just loading prefs
     }
     m_settingsModified = true;
-
-#ifdef __RUBBERBAND__
 }
 
+#ifdef __RUBBERBAND__
 void DlgPrefSound::updateKeylockDualThreadingCheckbox() {
     bool supportedScaler = keylockComboBox->currentData()
                                    .value<EngineBuffer::KeylockEngine>() !=
@@ -790,8 +791,8 @@ void DlgPrefSound::updateKeylockMultithreading(bool enabled) {
     keylockDualthreadedCheckBox->setChecked(msg.clickedButton() == pYesBtn);
 
     updateKeylockDualThreadingCheckbox();
-#endif
 }
+#endif
 
 /// Slot called when a device from the config can not be selected, i.e. is
 /// currently not available. This may happen during startup when MixxxMainWindow
@@ -910,7 +911,9 @@ void DlgPrefSound::slotResetToDefaults() {
     latencyCompensationSpinBox->setValue(latencyCompensationSpinBox->minimum());
 
     settingChanged();
+#ifdef __RUBBERBAND__
     updateKeylockDualThreadingCheckbox();
+#endif
 }
 
 void DlgPrefSound::bufferUnderflow(double count) {