feat: simplify waveform combobox

CMakeLists.txt

@@ -1521,7 +1521,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/waveformrenderertextured.cpp
@@ -1531,14 +1530,10 @@ 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/rgbstackedwaveformwidget.cpp
+ src/waveform/widgets/allshader/stackedwaveformwidget.cpp
  src/waveform/widgets/allshader/simplewaveformwidget.cpp
  src/waveform/widgets/allshader/waveformwidget.cpp
- src/waveform/widgets/allshader/waveformwidgettexturedfiltered.cpp
- src/waveform/widgets/allshader/waveformwidgettexturedrgb.cpp
- src/waveform/widgets/allshader/waveformwidgettexturedstacked.cpp
  src/widget/openglwindow.cpp
  src/widget/tooltipqopengl.cpp
  src/widget/wglwidgetqopengl.cpp
@@ -2194,6 +2189,7 @@ add_executable(mixxx-test
  src/test/wbatterytest.cpp
  src/test/wpushbutton_test.cpp
  src/test/wwidgetstack_test.cpp
+ src/test/waveform_upgrade_test.cpp
  src/util/moc_included_test.cpp
 )
 target_precompile_headers(mixxx-test REUSE_FROM mixxx-lib)

res/shaders/rgbsignal.frag

@@ -5,6 +5,7 @@ uniform vec4 axesColor;
 uniform vec4 lowColor;
 uniform vec4 midColor;
 uniform vec4 highColor;
+uniform bool splitStereoSignal;
 
 uniform int waveformLength;
 uniform int textureSize;
@@ -21,8 +22,8 @@ uniform sampler2D waveformDataTexture;
 
 vec4 getWaveformData(float index) {
  vec2 uv_data;
- uv_data.y = floor(index / float(textureStride));
- uv_data.x = floor(index - uv_data.y * float(textureStride));
+ uv_data.y = splitStereoSignal ? floor(index / float(textureStride)) : max(floor(index / float(textureStride)), floor((index + 1) / float(textureStride)));
+ uv_data.x = splitStereoSignal ? floor(index - uv_data.y * float(textureStride)) : max(floor(index - uv_data.y * float(textureStride)), floor((index + 1) - uv_data.y * float(textureStride)));
  // Divide again to convert to normalized UV coordinates.
  return texture2D(waveformDataTexture, uv_data / float(textureStride));
 }
@@ -36,7 +37,7 @@ void main(void) {
 
  // Texture coordinates put (0,0) at the bottom left, so show the right
  // channel if we are in the bottom half.
- if (uv.y < 0.5) {
+ if (uv.y < 0.5 && splitStereoSignal) {
  new_currentIndex += 1;
  }
 

src/preferences/dialog/dlgprefwaveform.cpp

@@ -8,6 +8,10 @@
 #include "waveform/renderers/waveformwidgetrenderer.h"
 #include "waveform/waveformwidgetfactory.h"
 
+namespace {
+constexpr WaveformWidgetType::Type kDefaultWaveform = WaveformWidgetType::RGB;
+} // anonymous namespace
+
 DlgPrefWaveform::DlgPrefWaveform(
  QWidget* pParent,
  UserSettingsPointer pConfig,
@@ -19,17 +23,20 @@ DlgPrefWaveform::DlgPrefWaveform(
 
  // Waveform overview init
  waveformOverviewComboBox->addItem(tr("Filtered")); // "0"
- waveformOverviewComboBox->addItem(tr("HSV")); // "1"
- waveformOverviewComboBox->addItem(tr("RGB")); // "2"
+ waveformOverviewComboBox->addItem(tr("HSV"));  // "1"
+ waveformOverviewComboBox->addItem(tr("RGB"));  // "2"
 
  // Populate waveform options.
  WaveformWidgetFactory* factory = WaveformWidgetFactory::instance();
  // 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) {
+ if (types[i].getType() == WaveformWidgetType::Empty) {
+ continue;
+ }
+ waveformTypeComboBox->addItem(types[i].getDisplayName(), types[i].getType());
  }
  // Sort the combobox items alphabetically
  waveformTypeComboBox->model()->sort(0);
@@ -88,10 +95,28 @@ DlgPrefWaveform::DlgPrefWaveform(
  beatGridAlphaSlider,
  &QSlider::setValue);
 
+ connect(useWaveformCheckBox,
+ &QCheckBox::clicked,
+ this,
+ &DlgPrefWaveform::slotSetWaveformEnabled);
+
  connect(waveformTypeComboBox,
  QOverload<int>::of(&QComboBox::currentIndexChanged),
  this,
  &DlgPrefWaveform::slotSetWaveformType);
+
+ connect(useAccelerationCheckBox,
+ &QCheckBox::clicked,
+ this,
+ &DlgPrefWaveform::slotSetWaveformAcceleration);
+ connect(splitLeftRightCheckBox,
+ &QCheckBox::clicked,
+ this,
+ &DlgPrefWaveform::slotSetWaveformOptionSplitStereoSignal);
+ connect(highDetailCheckBox,
+ &QCheckBox::clicked,
+ this,
+ &DlgPrefWaveform::slotSetWaveformOptionHighDetail);
  connect(defaultZoomComboBox,
  QOverload<int>::of(&QComboBox::currentIndexChanged),
  this,
@@ -159,21 +184,59 @@ DlgPrefWaveform::DlgPrefWaveform(
 DlgPrefWaveform::~DlgPrefWaveform() {
 }
 
+void DlgPrefWaveform::slotSetWaveformOptions(
+ allshader::WaveformRendererSignalBase::Option option, bool enabled) {
+ int currentOption = m_pConfig->getValue(
+ ConfigKey("[Waveform]", "waveform_options"),
+ allshader::WaveformRendererSignalBase::None);
+ m_pConfig->setValue(ConfigKey("[Waveform]", "waveform_options"),
+ enabled ? currentOption |
+ option
+ : currentOption ^
+ option);
+ auto type = static_cast<WaveformWidgetType::Type>(
+ waveformTypeComboBox->currentData().toInt());
+ auto* factory = WaveformWidgetFactory::instance();
+ factory->setWidgetTypeFromHandle(
+ factory->findHandleIndexFromType(type), true);
+}
+
 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"),
+ factory->preferredBackend()) !=
+ 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);
  }
 
+ bool useWaveform = factory->getType() != WaveformWidgetType::Empty;
+ useWaveformCheckBox->setChecked(useWaveform);
+
+ int currentOptions = m_pConfig->getValue(
+ ConfigKey("[Waveform]", "waveform_options"),
+ allshader::WaveformRendererSignalBase::None);
+ WaveformWidgetBackend backend = m_pConfig->getValue(
+ ConfigKey("[Waveform]", "use_hardware_acceleration"),
+ factory->preferredBackend());
+ updateWaveformAcceleration(factory->getType(), backend);
+ updateWaveformOption(useWaveform, backend, currentOptions);
+ waveformTypeComboBox->setEnabled(useWaveform);
  updateEnableUntilMark();
 
  frameRateSpinBox->setValue(factory->getFrameRate());
@@ -227,13 +290,23 @@ void DlgPrefWaveform::slotApply() {
 void DlgPrefWaveform::slotResetToDefaults() {
  WaveformWidgetFactory* factory = WaveformWidgetFactory::instance();
 
- // 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()));
+ kDefaultWaveform);
  if (defaultIndex != -1 && waveformTypeComboBox->currentIndex() != defaultIndex) {
  waveformTypeComboBox->setCurrentIndex(defaultIndex);
  }
+ auto defaultBackend = factory->preferredBackend();
+ useWaveformCheckBox->setChecked(true);
+ waveformTypeComboBox->setEnabled(true);
+ updateWaveformAcceleration(kDefaultWaveform, defaultBackend);
+ updateWaveformOption(true, defaultBackend, allshader::WaveformRendererSignalBase::None);
+
+ // Restore waveform backend and option setting instantly
+ m_pConfig->setValue(ConfigKey("[Waveform]", "waveform_options"),
+ allshader::WaveformRendererSignalBase::None);
+ m_pConfig->setValue(ConfigKey("[Waveform]", "use_hardware_acceleration"),
+ defaultBackend);
+ factory->setWidgetTypeFromHandle(factory->findHandleIndexFromType(kDefaultWaveform), true);
 
  allVisualGain->setValue(1.0);
  lowVisualGain->setValue(1.0);
@@ -280,14 +353,137 @@ 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));
+
+ auto backend = m_pConfig->getValue(
+ ConfigKey("[Waveform]", "use_hardware_acceleration"),
+ factory->preferredBackend());
+ useAccelerationCheckBox->setChecked(backend !=
+ WaveformWidgetBackend::None);
+
+ int currentOptions = m_pConfig->getValue(
+ ConfigKey("[Waveform]", "waveform_options"),
+ allshader::WaveformRendererSignalBase::None);
+ updateWaveformAcceleration(type, backend);
+ updateWaveformOption(true, backend, currentOptions);
+ updateEnableUntilMark();
+}
+
+void DlgPrefWaveform::slotSetWaveformEnabled(bool checked) {
+ auto* factory = WaveformWidgetFactory::instance();
+ if (!checked) {
+ factory->setWidgetTypeFromHandle(
+ factory->findHandleIndexFromType(WaveformWidgetType::Empty),
+ true);
+ } else {
+ auto type = static_cast<WaveformWidgetType::Type>(
+ waveformTypeComboBox->currentData().toInt());
+ factory->setWidgetTypeFromHandle(factory->findHandleIndexFromType(type), true);
+ }
+ slotUpdate();
+}
 
+void DlgPrefWaveform::slotSetWaveformAcceleration(bool checked) {
+ WaveformWidgetBackend backend = WaveformWidgetBackend::None;
+ if (checked) {
+ backend =
+#ifdef MIXXX_USE_QOPENGL
+ WaveformWidgetBackend::AllShader
+#else
+ WaveformWidgetBackend::GL
+#endif
+ ;
+ }
+ m_pConfig->setValue(
+ ConfigKey("[Waveform]", "use_hardware_acceleration"),
+ backend);
+ auto type = static_cast<WaveformWidgetType::Type>(waveformTypeComboBox->currentData().toInt());
+ auto* factory = WaveformWidgetFactory::instance();
+ factory->setWidgetTypeFromHandle(factory->findHandleIndexFromType(type), true);
+ int currentOptions = m_pConfig->getValue(
+ ConfigKey("[Waveform]", "waveform_options"),
+ allshader::WaveformRendererSignalBase::None);
+ updateWaveformOption(true, backend, currentOptions);
  updateEnableUntilMark();
 }
 
+void DlgPrefWaveform::updateWaveformAcceleration(
+ WaveformWidgetType::Type type, WaveformWidgetBackend backend) {
+ auto* factory = WaveformWidgetFactory::instance();
+ int handleIdx = factory->findHandleIndexFromType(type);
+
+ bool supportAcceleration = false, supportSoftware = true;
+ if (handleIdx != -1) {
+ const auto& handle = factory->getAvailableTypes()[handleIdx];
+ supportAcceleration = handle.supportAcceleration();
+ supportSoftware = handle.supportSoftware();
+ }
+ useAccelerationCheckBox->blockSignals(true);
+
+ if (type == WaveformWidgetType::Empty) {
+ useAccelerationCheckBox->setChecked(false);
+ } else if (supportSoftware ^ supportAcceleration) {
+ useAccelerationCheckBox->setChecked(!supportSoftware || supportAcceleration);
+ } else {
+ useAccelerationCheckBox->setChecked(backend != WaveformWidgetBackend::None);
+ }
+
+ useAccelerationCheckBox->setEnabled(supportAcceleration &&
+ supportSoftware && type != WaveformWidgetType::Empty);
+
+ useAccelerationCheckBox->blockSignals(false);
+}
+void DlgPrefWaveform::updateWaveformOption(
+ bool useWaveform, WaveformWidgetBackend backend, int currentOption) {
+ splitLeftRightCheckBox->blockSignals(true);
+ highDetailCheckBox->blockSignals(true);
+
+#ifdef MIXXX_USE_QOPENGL
+ WaveformWidgetFactory* factory = WaveformWidgetFactory::instance();
+ int supportedOption = allshader::WaveformRendererSignalBase::None;
+
+ auto type = static_cast<WaveformWidgetType::Type>(waveformTypeComboBox->currentData().toInt());
+ int handleIdx = factory->findHandleIndexFromType(type);
+
+ if (handleIdx != -1) {
+ supportedOption = factory->getAvailableTypes()[handleIdx].supportedOptions(backend);
+ }
+
+ splitLeftRightCheckBox->setEnabled(useWaveform &&
+ supportedOption &
+ allshader::WaveformRendererSignalBase::SplitStereoSignal);
+ highDetailCheckBox->setEnabled(useWaveform &&
+ supportedOption &
+ allshader::WaveformRendererSignalBase::HighDetail);
+ splitLeftRightCheckBox->setChecked(splitLeftRightCheckBox->isEnabled() &&
+ currentOption &
+ allshader::WaveformRendererSignalBase::SplitStereoSignal);
+ highDetailCheckBox->setChecked(highDetailCheckBox->isEnabled() &&
+ currentOption & allshader::WaveformRendererSignalBase::HighDetail);
+#else
+ splitLeftRightCheckBox->setVisible(false);
+ highDetailCheckBox->setVisible(false);
+#endif
+
+ splitLeftRightCheckBox->blockSignals(false);
+ highDetailCheckBox->blockSignals(false);
+}
+
 void DlgPrefWaveform::updateEnableUntilMark() {
- const bool enabled = WaveformWidgetFactory::instance()->widgetTypeSupportsUntilMark();
+#ifndef MIXXX_USE_QOPENGL
+ const bool enabled = false;
+#else
+ WaveformWidgetFactory* factory = WaveformWidgetFactory::instance();
+ const bool enabled =
+ WaveformWidgetFactory::instance()->widgetTypeSupportsUntilMark() &&
+ m_pConfig->getValue(
+ ConfigKey("[Waveform]", "use_hardware_acceleration"),
+ factory->preferredBackend()) !=
+ WaveformWidgetBackend::None;
+#endif
  untilMarkShowBeatsCheckBox->setEnabled(enabled);
  untilMarkShowTimeCheckBox->setEnabled(enabled);
  untilMarkAlignLabel->setEnabled(enabled);
@@ -298,7 +494,7 @@ void DlgPrefWaveform::updateEnableUntilMark() {
 }
 
 void DlgPrefWaveform::slotSetWaveformOverviewType(int index) {
- m_pConfig->set(ConfigKey("[Waveform]","WaveformOverviewType"), ConfigValue(index));
+ m_pConfig->set(ConfigKey("[Waveform]", "WaveformOverviewType"), ConfigValue(index));
  emit reloadUserInterface();
 }