compile and show qt waveforms only when MIXXX_USE_QOPENGL is not set

3 files changed, 66 insertions, 30 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f2acf352e..ace7ee93e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1131,9 +1131,6 @@ else()
     src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
     src/waveform/renderers/glwaveformrendererrgb.cpp
     src/waveform/renderers/glwaveformrenderersimplesignal.cpp
-    src/waveform/renderers/qtvsynctestrenderer.cpp
-    src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp
-    src/waveform/renderers/qtwaveformrenderersimplesignal.cpp
     src/waveform/renderers/waveformmark.cpp
     src/waveform/renderers/waveformmarkrange.cpp
     src/waveform/renderers/waveformmarkset.cpp
@@ -1163,11 +1160,6 @@ else()
     src/waveform/widgets/glwaveformwidget.cpp
     src/waveform/widgets/glwaveformwidgetabstract.cpp
     src/waveform/widgets/hsvwaveformwidget.cpp
-    src/waveform/widgets/qthsvwaveformwidget.cpp
-    src/waveform/widgets/qtrgbwaveformwidget.cpp
-    src/waveform/widgets/qtsimplewaveformwidget.cpp
-    src/waveform/widgets/qtvsynctestwidget.cpp
-    src/waveform/widgets/qtwaveformwidget.cpp
     src/waveform/widgets/rgbwaveformwidget.cpp
     src/waveform/widgets/softwarewaveformwidget.cpp
     src/waveform/widgets/waveformwidgetabstract.cpp
@@ -1218,6 +1210,14 @@ else()
     )
   else()
     target_sources(mixxx-lib PRIVATE
+      src/waveform/renderers/qtvsynctestrenderer.cpp
+      src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp
+      src/waveform/renderers/qtwaveformrenderersimplesignal.cpp
+      src/waveform/widgets/qthsvwaveformwidget.cpp
+      src/waveform/widgets/qtrgbwaveformwidget.cpp
+      src/waveform/widgets/qtsimplewaveformwidget.cpp
+      src/waveform/widgets/qtvsynctestwidget.cpp
+      src/waveform/widgets/qtwaveformwidget.cpp
       src/widget/wglwidgetqglwidget.cpp
     )
   endif()
diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp
index 924e0263d1..d1ebe337b0 100644
--- a/src/waveform/waveformwidgetfactory.cpp
+++ b/src/waveform/waveformwidgetfactory.cpp
@@ -31,6 +31,12 @@
 #include "waveform/widgets/allshader/lrrgbwaveformwidget.h"
 #include "waveform/widgets/allshader/rgbwaveformwidget.h"
 #include "waveform/widgets/allshader/simplewaveformwidget.h"
+#else
+#include "waveform/widgets/qthsvwaveformwidget.h"
+#include "waveform/widgets/qtrgbwaveformwidget.h"
+#include "waveform/widgets/qtsimplewaveformwidget.h"
+#include "waveform/widgets/qtvsynctestwidget.h"
+#include "waveform/widgets/qtwaveformwidget.h"
 #endif
 #include "waveform/widgets/emptywaveformwidget.h"
 #include "waveform/widgets/glrgbwaveformwidget.h"
@@ -40,11 +46,6 @@
 #include "waveform/widgets/glwaveformwidget.h"
 #include "waveform/widgets/hsvwaveformwidget.h"
 #include "waveform/widgets/nonglwaveformwidgetabstract.h"
-#include "waveform/widgets/qthsvwaveformwidget.h"
-#include "waveform/widgets/qtrgbwaveformwidget.h"
-#include "waveform/widgets/qtsimplewaveformwidget.h"
-#include "waveform/widgets/qtvsynctestwidget.h"
-#include "waveform/widgets/qtwaveformwidget.h"
 #include "waveform/widgets/rgbwaveformwidget.h"
 #include "waveform/widgets/softwarewaveformwidget.h"
 #include "waveform/widgets/waveformwidgetabstract.h"
@@ -865,19 +866,27 @@ void WaveformWidgetFactory::evaluateWidgets() {
             break;
 #endif
         case WaveformWidgetType::QtSimpleWaveform:
+#ifdef MIXXX_USE_QOPENGL
+            continue;
+#else
             widgetName = QtSimpleWaveformWidget::getWaveformWidgetName();
             useOpenGl = QtSimpleWaveformWidget::useOpenGl();
             useOpenGles = QtSimpleWaveformWidget::useOpenGles();
             useOpenGLShaders = QtSimpleWaveformWidget::useOpenGLShaders();
             developerOnly = QtSimpleWaveformWidget::developerOnly();
             break;
+#endif
         case WaveformWidgetType::QtWaveform:
+#ifdef MIXXX_USE_QOPENGL
+            continue;
+#else
             widgetName = QtWaveformWidget::getWaveformWidgetName();
             useOpenGl = QtWaveformWidget::useOpenGl();
             useOpenGles = QtWaveformWidget::useOpenGles();
             useOpenGLShaders = QtWaveformWidget::useOpenGLShaders();
             developerOnly = QtWaveformWidget::developerOnly();
             break;
+#endif
         case WaveformWidgetType::GLSimpleWaveform:
             widgetName = GLSimpleWaveformWidget::getWaveformWidgetName();
             useOpenGl = GLSimpleWaveformWidget::useOpenGl();
@@ -928,49 +937,75 @@ void WaveformWidgetFactory::evaluateWidgets() {
             developerOnly = GLRGBWaveformWidget::developerOnly();
             break;
         case WaveformWidgetType::QtVSyncTest:
+#ifdef MIXXX_USE_QOPENGL
+            continue;
+#else
             widgetName = QtVSyncTestWidget::getWaveformWidgetName();
             useOpenGl = QtVSyncTestWidget::useOpenGl();
             useOpenGles =  QtVSyncTestWidget::useOpenGles();
             useOpenGLShaders = QtVSyncTestWidget::useOpenGLShaders();
             developerOnly = QtVSyncTestWidget::developerOnly();
+#endif
             break;
         case WaveformWidgetType::QtHSVWaveform:
+#ifdef MIXXX_USE_QOPENGL
+            continue;
+#else
             widgetName = QtHSVWaveformWidget::getWaveformWidgetName();
             useOpenGl = QtHSVWaveformWidget::useOpenGl();
             useOpenGles = QtHSVWaveformWidget::useOpenGles();
             useOpenGLShaders = QtHSVWaveformWidget::useOpenGLShaders();
             developerOnly = QtHSVWaveformWidget::developerOnly();
             break;
+#endif
         case WaveformWidgetType::QtRGBWaveform:
+#ifdef MIXXX_USE_QOPENGL
+            continue;
+#else
             widgetName = QtRGBWaveformWidget::getWaveformWidgetName();
             useOpenGl = QtRGBWaveformWidget::useOpenGl();
             useOpenGles = QtRGBWaveformWidget::useOpenGles();
             useOpenGLShaders = QtRGBWaveformWidget::useOpenGLShaders();
             developerOnly = QtRGBWaveformWidget::developerOnly();
             break;
-#ifdef MIXXX_USE_QOPENGL
+#endif
         case WaveformWidgetType::AllShaderRGBWaveform:
+#ifndef MIXXX_USE_QOPENGL
+            continue;
+#else
             widgetName = allshader::RGBWaveformWidget::getWaveformWidgetName();
             useOpenGl = allshader::RGBWaveformWidget::useOpenGl();
             useOpenGles = allshader::RGBWaveformWidget::useOpenGles();
             useOpenGLShaders = allshader::RGBWaveformWidget::useOpenGLShaders();
             developerOnly = allshader::RGBWaveformWidget::developerOnly();
             break;
+#endif
         case WaveformWidgetType::AllShaderLRRGBWaveform:
+#ifndef MIXXX_USE_QOPENGL
+            continue;
+#else
             widgetName = allshader::LRRGBWaveformWidget::getWaveformWidgetName();
             useOpenGl = allshader::LRRGBWaveformWidget::useOpenGl();
             useOpenGles = allshader::LRRGBWaveformWidget::useOpenGles();
             useOpenGLShaders = allshader::LRRGBWaveformWidget::useOpenGLShaders();
             developerOnly = allshader::LRRGBWaveformWidget::developerOnly();
             break;
+#endif
         case WaveformWidgetType::AllShaderFilteredWaveform:
+#ifndef MIXXX_USE_QOPENGL
+            continue;
+#else
             widgetName = allshader::FilteredWaveformWidget::getWaveformWidgetName();
             useOpenGl = allshader::FilteredWaveformWidget::useOpenGl();
             useOpenGles = allshader::FilteredWaveformWidget::useOpenGles();
             useOpenGLShaders = allshader::FilteredWaveformWidget::useOpenGLShaders();
             developerOnly = allshader::FilteredWaveformWidget::developerOnly();
             break;
+#endif
         case WaveformWidgetType::AllShaderSimpleWaveform:
+#ifndef MIXXX_USE_QOPENGL
+            continue;
+#else
             widgetName = allshader::SimpleWaveformWidget::getWaveformWidgetName();
             useOpenGl = allshader::SimpleWaveformWidget::useOpenGl();
             useOpenGles = allshader::SimpleWaveformWidget::useOpenGles();
@@ -1048,12 +1083,6 @@ WaveformWidgetAbstract* WaveformWidgetFactory::createWaveformWidget(
         case WaveformWidgetType::RGBWaveform:
             widget = new RGBWaveformWidget(viewer->getGroup(), viewer);
             break;
-        case WaveformWidgetType::QtSimpleWaveform:
-            widget = new QtSimpleWaveformWidget(viewer->getGroup(), viewer);
-            break;
-        case WaveformWidgetType::QtWaveform:
-            widget = new QtWaveformWidget(viewer->getGroup(), viewer);
-            break;
         case WaveformWidgetType::GLSimpleWaveform:
             widget = new GLSimpleWaveformWidget(viewer->getGroup(), viewer);
             break;
@@ -1075,15 +1104,6 @@ WaveformWidgetAbstract* WaveformWidgetFactory::createWaveformWidget(
         case WaveformWidgetType::GLVSyncTest:
             widget = new GLVSyncTestWidget(viewer->getGroup(), viewer);
             break;
-        case WaveformWidgetType::QtVSyncTest:
-            widget = new QtVSyncTestWidget(viewer->getGroup(), viewer);
-            break;
-        case WaveformWidgetType::QtHSVWaveform:
-            widget = new QtHSVWaveformWidget(viewer->getGroup(), viewer);
-            break;
-        case WaveformWidgetType::QtRGBWaveform:
-            widget = new QtRGBWaveformWidget(viewer->getGroup(), viewer);
-            break;
 #ifdef MIXXX_USE_QOPENGL
         case WaveformWidgetType::AllShaderRGBWaveform:
             widget = new allshader::RGBWaveformWidget(viewer->getGroup(), viewer);
@@ -1097,6 +1117,22 @@ WaveformWidgetAbstract* WaveformWidgetFactory::createWaveformWidget(
         case WaveformWidgetType::AllShaderSimpleWaveform:
             widget = new allshader::SimpleWaveformWidget(viewer->getGroup(), viewer);
             break;
+#else
+        case WaveformWidgetType::QtSimpleWaveform:
+            widget = new QtSimpleWaveformWidget(viewer->getGroup(), viewer);
+            break;
+        case WaveformWidgetType::QtWaveform:
+            widget = new QtWaveformWidget(viewer->getGroup(), viewer);
+            break;
+        case WaveformWidgetType::QtVSyncTest:
+            widget = new QtVSyncTestWidget(viewer->getGroup(), viewer);
+            break;
+        case WaveformWidgetType::QtHSVWaveform:
+            widget = new QtHSVWaveformWidget(viewer->getGroup(), viewer);
+            break;
+        case WaveformWidgetType::QtRGBWaveform:
+            widget = new QtRGBWaveformWidget(viewer->getGroup(), viewer);
+            break;
 #endif
         default:
         //case WaveformWidgetType::SoftwareSimpleWaveform: TODO: (vrince)
diff --git a/src/waveform/widgets/allshader/lrrgbwaveformwidget.h b/src/waveform/widgets/allshader/lrrgbwaveformwidget.h
index e27c62427b..67e30f9f73 100644
--- a/src/waveform/widgets/allshader/lrrgbwaveformwidget.h
+++ b/src/waveform/widgets/allshader/lrrgbwaveformwidget.h
@@ -19,7 +19,7 @@ class allshader::LRRGBWaveformWidget final : public allshader::WaveformWidget {
     }
 
     static inline QString getWaveformWidgetName() {
-        return tr("RGB-L/R (all-shaders)");
+        return tr("RGB L/R (all-shaders)");
     }
     static constexpr bool useOpenGl() {
         return true;