Add option to for signal split waveform

mixxxdj · May 9, 2024 · 0907c2e · 0907c2e
1 parent 0ace13e
commit 0907c2e
Show file tree

Hide file tree

Showing 5 changed files with 437 additions and 393 deletions.
diff --git a/src/preferences/dialog/dlgprefwaveform.cpp b/src/preferences/dialog/dlgprefwaveform.cpp
@@ -16,6 +16,8 @@ const QList<WaveformWidgetType::Type> kWaveformWithOnlyAcceleration = {
 const QList<WaveformWidgetType::Type> kWaveformWithoutAcceleration = {
         WaveformWidgetType::VSyncTest,
         WaveformWidgetType::Empty};
+const QList<WaveformWidgetType::Type> kWaveformWithSplitSignalSupport = {
+        WaveformWidgetType::RGB};
 
 void setAccelerationCheckboxProperty(WaveformWidgetType::Type type, QCheckBox* checkbox) {
     checkbox->blockSignals(true);
@@ -30,6 +32,13 @@ void setAccelerationCheckboxProperty(WaveformWidgetType::Type type, QCheckBox* c
     }
     checkbox->blockSignals(false);
 }
+void updateStereoSplitVisibility(WaveformWidgetType::Type type,
+        bool isAccelerationEnabled,
+        QCheckBox* checkbox) {
+    checkbox->blockSignals(true);
+    checkbox->setVisible(isAccelerationEnabled && kWaveformWithSplitSignalSupport.contains(type));
+    checkbox->blockSignals(false);
+}
 } // anonymous namespace
 
 DlgPrefWaveform::DlgPrefWaveform(
@@ -121,6 +130,10 @@ DlgPrefWaveform::DlgPrefWaveform(
             &QCheckBox::clicked,
             this,
             &DlgPrefWaveform::slotSetWaveformAcceleration);
+    connect(splitLeftRightCheckBox,
+            &QCheckBox::clicked,
+            this,
+            &DlgPrefWaveform::slotSetWaveformSplitSignal);
     connect(defaultZoomComboBox,
             QOverload<int>::of(&QComboBox::currentIndexChanged),
             this,
@@ -191,14 +204,15 @@ DlgPrefWaveform::~DlgPrefWaveform() {
 void DlgPrefWaveform::slotUpdate() {
     WaveformWidgetFactory* factory = WaveformWidgetFactory::instance();
 
+    bool isAccelerationEnabled = false;
     if (factory->isOpenGlAvailable() || factory->isOpenGlesAvailable()) {
         openGlStatusData->setText(factory->getOpenGLVersion());
         useAccelerationCheckBox->setEnabled(true);
-        useAccelerationCheckBox->setChecked(
-                m_pConfig->getValue(
-                        ConfigKey("[Waveform]", "use_hardware_acceleration"),
-                        WaveformWidgetBackend::AllShader) !=
-                WaveformWidgetBackend::None);
+        isAccelerationEnabled = m_pConfig->getValue(
+                                        ConfigKey("[Waveform]", "use_hardware_acceleration"),
+                                        WaveformWidgetBackend::AllShader) !=
+                WaveformWidgetBackend::None;
+        useAccelerationCheckBox->setChecked(isAccelerationEnabled);
     } else {
         openGlStatusData->setText(tr("OpenGL not available") + ": " + factory->getOpenGLVersion());
         useAccelerationCheckBox->setEnabled(false);
@@ -210,8 +224,13 @@ void DlgPrefWaveform::slotUpdate() {
     if (currentIndex != -1 && waveformTypeComboBox->currentIndex() != currentIndex) {
         waveformTypeComboBox->setCurrentIndex(currentIndex);
     }
+    splitLeftRightCheckBox->setChecked(
+            m_pConfig->getValue(
+                    ConfigKey("[Waveform]", "split_stereo_signal"),
+                    false));
 
     setAccelerationCheckboxProperty(factory->getType(), useAccelerationCheckBox);
+    updateStereoSplitVisibility(factory->getType(), isAccelerationEnabled, splitLeftRightCheckBox);
     updateEnableUntilMark();
 
     frameRateSpinBox->setValue(factory->getFrameRate());
@@ -320,10 +339,16 @@ void DlgPrefWaveform::slotSetWaveformType(int index) {
     }
     auto type = static_cast<WaveformWidgetType::Type>(
             waveformTypeComboBox->itemData(index).toInt());
-    auto factory = WaveformWidgetFactory::instance();
+    auto* factory = WaveformWidgetFactory::instance();
     factory->setWidgetTypeFromHandle(factory->findHandleIndexFromType(type));
 
     setAccelerationCheckboxProperty(factory->getType(), useAccelerationCheckBox);
+    bool isAccelerationEnabled = m_pConfig->getValue(
+                                         ConfigKey("[Waveform]", "use_hardware_acceleration"),
+                                         WaveformWidgetBackend::AllShader) !=
+            WaveformWidgetBackend::None;
+    useAccelerationCheckBox->setChecked(isAccelerationEnabled);
+    updateStereoSplitVisibility(factory->getType(), isAccelerationEnabled, splitLeftRightCheckBox);
     updateEnableUntilMark();
 }
 
@@ -342,12 +367,21 @@ void DlgPrefWaveform::slotSetWaveformAcceleration(bool checked) {
                 WaveformWidgetBackend::None);
     }
     auto type = static_cast<WaveformWidgetType::Type>(waveformTypeComboBox->currentData().toInt());
-    auto factory = WaveformWidgetFactory::instance();
+    auto* factory = WaveformWidgetFactory::instance();
     factory->setWidgetTypeFromHandle(factory->findHandleIndexFromType(type), true);
+    updateStereoSplitVisibility(type, checked, splitLeftRightCheckBox);
 
     updateEnableUntilMark();
 }
 
+void DlgPrefWaveform::slotSetWaveformSplitSignal(bool checked) {
+    m_pConfig->setValue(ConfigKey("[Waveform]", "split_stereo_signal"),
+            checked);
+    auto type = static_cast<WaveformWidgetType::Type>(waveformTypeComboBox->currentData().toInt());
+    auto* factory = WaveformWidgetFactory::instance();
+    factory->setWidgetTypeFromHandle(factory->findHandleIndexFromType(type), true);
+}
+
 void DlgPrefWaveform::updateEnableUntilMark() {
 #ifndef MIXXX_USE_QOPENGL
     const bool enabled = false;

diff --git a/src/preferences/dialog/dlgprefwaveform.h b/src/preferences/dialog/dlgprefwaveform.h
@@ -27,6 +27,7 @@ class DlgPrefWaveform : public DlgPreferencePage, public Ui::DlgPrefWaveformDlg
     void slotSetFrameRate(int frameRate);
     void slotSetWaveformType(int index);
     void slotSetWaveformAcceleration(bool checked);
+    void slotSetWaveformSplitSignal(bool checked);
     void slotSetWaveformOverviewType(int index);
     void slotSetDefaultZoom(int index);
     void slotSetZoomSynchronization(bool checked);