option to use the legacy aka non-glsl spinny

m0dB · Sep 17, 2023 · ee90380 · ee90380
1 parent b1f1c07
commit ee90380
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp
@@ -1310,7 +1310,8 @@ QWidget* LegacySkinParser::parseSpinny(const QDomElement& node) {
     WSpinnyBase* pSpinny;
     if (qApp->platformName() == QLatin1String("xcb")) {
 #ifdef MIXXX_USE_QOPENGL
-        if (pWaveformWidgetFactory->isOpenGlShaderAvailable()) {
+        if (pWaveformWidgetFactory->isOpenGlShaderAvailable() &&
+                !CmdlineArgs::Instance().getUseLegacySpinny()) {
             pSpinny = new WSpinnyGLSL(nullptr, group, m_pConfig, m_pVCManager, pPlayer);
         } else
 #endif
@@ -1320,7 +1321,8 @@ QWidget* LegacySkinParser::parseSpinny(const QDomElement& node) {
         pSpinny->setParent(m_pParent);
     } else {
 #ifdef MIXXX_USE_QOPENGL
-        if (pWaveformWidgetFactory->isOpenGlShaderAvailable()) {
+        if (pWaveformWidgetFactory->isOpenGlShaderAvailable() &&
+                !CmdlineArgs::Instance().getUseLegacySpinny()) {
             pSpinny = new WSpinnyGLSL(m_pParent, group, m_pConfig, m_pVCManager, pPlayer);
         } else
 #endif

diff --git a/src/util/cmdlineargs.cpp b/src/util/cmdlineargs.cpp
@@ -24,6 +24,7 @@ CmdlineArgs::CmdlineArgs()
           m_developer(false),
           m_safeMode(false),
           m_useVuMeterGL(false),
+          m_useLegacySpinny(false),
           m_debugAssertBreak(false),
           m_settingsPathSet(false),
           m_scaleFactor(1.0),
@@ -178,6 +179,12 @@ bool CmdlineArgs::parse(const QStringList& arguments, CmdlineArgs::ParseMode mod
                             : QString());
     parser.addOption(enableVuMeterGL);
 
+    const QCommandLineOption enableLegacySpinny(QStringLiteral("enable-legacy-spinny"),
+            forUserFeedback ? QCoreApplication::translate("CmdlineArgs",
+                                      "Use legacy spinny")
+                            : QString());
+    parser.addOption(enableLegacySpinny);
+
     const QCommandLineOption controllerDebug(QStringLiteral("controller-debug"),
             forUserFeedback ? QCoreApplication::translate("CmdlineArgs",
                                       "Causes Mixxx to display/log all of the controller data it "
@@ -339,6 +346,7 @@ bool CmdlineArgs::parse(const QStringList& arguments, CmdlineArgs::ParseMode mod
     }
 
     m_useVuMeterGL = parser.isSet(enableVuMeterGL);
+    m_useLegacySpinny = parser.isSet(enableLegacySpinny);
     m_controllerDebug = parser.isSet(controllerDebug) || parser.isSet(controllerDebugDeprecated);
     m_controllerAbortOnWarning = parser.isSet(controllerAbortOnWarning);
     m_developer = parser.isSet(developer);

diff --git a/src/util/cmdlineargs.h b/src/util/cmdlineargs.h
@@ -45,6 +45,9 @@ class CmdlineArgs final {
     bool getUseVuMeterGL() const {
         return m_useVuMeterGL;
     }
+    bool getUseLegacySpinny() const {
+        return m_useLegacySpinny;
+    }
     bool getDebugAssertBreak() const { return m_debugAssertBreak; }
     bool getSettingsPathSet() const { return m_settingsPathSet; }
     mixxx::LogLevel getLogLevel() const { return m_logLevel; }
@@ -80,6 +83,7 @@ class CmdlineArgs final {
     bool m_developer; // Developer Mode
     bool m_safeMode;
     bool m_useVuMeterGL;
+    bool m_useLegacySpinny;
     bool m_debugAssertBreak;
     bool m_settingsPathSet; // has --settingsPath been set on command line ?
     double m_scaleFactor;