feat: simplify waveform combobox

CMakeLists.txt

@@ -1520,7 +1520,6 @@ if(QOPENGL)
     src/waveform/renderers/allshader/waveformrendererslipmode.cpp
     src/waveform/renderers/allshader/waveformrendererfiltered.cpp
     src/waveform/renderers/allshader/waveformrendererhsv.cpp
-    src/waveform/renderers/allshader/waveformrendererlrrgb.cpp
     src/waveform/renderers/allshader/waveformrendererpreroll.cpp
     src/waveform/renderers/allshader/waveformrendererrgb.cpp
     src/waveform/renderers/allshader/waveformrenderersignalbase.cpp
@@ -1529,7 +1528,6 @@ if(QOPENGL)
     src/waveform/renderers/allshader/waveformrendermarkrange.cpp
     src/waveform/widgets/allshader/filteredwaveformwidget.cpp
     src/waveform/widgets/allshader/hsvwaveformwidget.cpp
-    src/waveform/widgets/allshader/lrrgbwaveformwidget.cpp
     src/waveform/widgets/allshader/rgbwaveformwidget.cpp
     src/waveform/widgets/allshader/simplewaveformwidget.cpp
     src/waveform/widgets/allshader/waveformwidget.cpp

src/preferences/dialog/dlgprefwaveform.cpp

@@ -8,6 +8,39 @@
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveformwidgetfactory.h"
 
+namespace {
+constexpr WaveformWidgetType::Type kDefaultWaveform = WaveformWidgetType::RGB;
+const QList<WaveformWidgetType::Type> kWaveformWithOnlyAcceleration = {
+        WaveformWidgetType::Simple,
+        WaveformWidgetType::Stacked};
+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);
+    if (kWaveformWithOnlyAcceleration.contains(type)) {
+        checkbox->setEnabled(false);
+        checkbox->setChecked(true);
+    } else if (kWaveformWithoutAcceleration.contains(type)) {
+        checkbox->setEnabled(false);
+        checkbox->setChecked(false);
+    } else {
+        checkbox->setEnabled(true);
+    }
+    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(
         QWidget* pParent,
         UserSettingsPointer pConfig,
@@ -27,9 +60,9 @@ DlgPrefWaveform::DlgPrefWaveform(
     // We assume that the original type list order remains constant.
     // We will use the type index later on to set waveform types and to
     // update the combobox.
-    QVector<WaveformWidgetAbstractHandle> handles = factory->getAvailableTypes();
-    for (int i = 0; i < handles.size(); ++i) {
-        waveformTypeComboBox->addItem(handles[i].getDisplayName(), i);
+    QVector<WaveformWidgetAbstractHandle> types = factory->getAvailableTypes();
+    for (int i = 0; i < types.size(); ++i) {
+        waveformTypeComboBox->addItem(types[i].getDisplayName(), types[i].getType());
     }
     // Sort the combobox items alphabetically
     waveformTypeComboBox->model()->sort(0);
@@ -92,6 +125,15 @@ DlgPrefWaveform::DlgPrefWaveform(
             QOverload<int>::of(&QComboBox::currentIndexChanged),
             this,
             &DlgPrefWaveform::slotSetWaveformType);
+
+    connect(useAccelerationCheckBox,
+            &QCheckBox::clicked,
+            this,
+            &DlgPrefWaveform::slotSetWaveformAcceleration);
+    connect(splitLeftRightCheckBox,
+            &QCheckBox::clicked,
+            this,
+            &DlgPrefWaveform::slotSetWaveformSplitSignal);
     connect(defaultZoomComboBox,
             QOverload<int>::of(&QComboBox::currentIndexChanged),
             this,
@@ -162,18 +204,33 @@ DlgPrefWaveform::~DlgPrefWaveform() {
 void DlgPrefWaveform::slotUpdate() {
     WaveformWidgetFactory* factory = WaveformWidgetFactory::instance();
 
+    bool isAccelerationEnabled = false;
     if (factory->isOpenGlAvailable() || factory->isOpenGlesAvailable()) {
         openGlStatusData->setText(factory->getOpenGLVersion());
+        useAccelerationCheckBox->setEnabled(true);
+        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);
+        useAccelerationCheckBox->setChecked(false);
     }
 
     // The combobox holds a list of [handle name, handle index]
-    int currentIndex = waveformTypeComboBox->findData(factory->getHandleIndex());
+    int currentIndex = waveformTypeComboBox->findData(factory->getType());
     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());
@@ -230,7 +287,7 @@ void DlgPrefWaveform::slotResetToDefaults() {
     // Get the default we ought to use based on whether the user has OpenGL or not.
     // Select the combobox index that holds the default handle's index in data column.
     int defaultIndex = waveformTypeComboBox->findData(
-            factory->findHandleIndexFromType(factory->autoChooseWidgetType()));
+            factory->findHandleIndexFromType(kDefaultWaveform));
     if (defaultIndex != -1 && waveformTypeComboBox->currentIndex() != defaultIndex) {
         waveformTypeComboBox->setCurrentIndex(defaultIndex);
     }
@@ -280,14 +337,62 @@ void DlgPrefWaveform::slotSetWaveformType(int index) {
     if (index < 0) {
         return;
     }
-    int handleIndex = waveformTypeComboBox->itemData(index).toInt();
-    WaveformWidgetFactory::instance()->setWidgetTypeFromHandle(handleIndex);
+    auto type = static_cast<WaveformWidgetType::Type>(
+            waveformTypeComboBox->itemData(index).toInt());
+    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();
+}
+
+void DlgPrefWaveform::slotSetWaveformAcceleration(bool checked) {
+    if (checked) {
+        m_pConfig->setValue(ConfigKey("[Waveform]", "use_hardware_acceleration"),
+#ifdef MIXXX_USE_QOPENGL
+                WaveformWidgetBackend::AllShader
+#else
+                WaveformWidgetBackend::GL
+#endif
+        );
+    } else {
+        m_pConfig->setValue(
+                ConfigKey("[Waveform]", "use_hardware_acceleration"),
+                WaveformWidgetBackend::None);
+    }
+    auto type = static_cast<WaveformWidgetType::Type>(waveformTypeComboBox->currentData().toInt());
+    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() {
-    const bool enabled = WaveformWidgetFactory::instance()->widgetTypeSupportsUntilMark();
+#ifndef MIXXX_USE_QOPENGL
+    const bool enabled = false;
+#else
+    const bool enabled =
+            WaveformWidgetFactory::instance()->widgetTypeSupportsUntilMark() &&
+            m_pConfig->getValue(
+                    ConfigKey("[Waveform]", "use_hardware_acceleration"),
+                    WaveformWidgetBackend::AllShader) !=
+                    WaveformWidgetBackend::None;
+#endif
     untilMarkShowBeatsCheckBox->setEnabled(enabled);
     untilMarkShowTimeCheckBox->setEnabled(enabled);
     untilMarkAlignLabel->setEnabled(enabled);

src/preferences/dialog/dlgprefwaveform.h

@@ -26,6 +26,8 @@ class DlgPrefWaveform : public DlgPreferencePage, public Ui::DlgPrefWaveformDlg
   private slots:
     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);