From 97b93ebbb4809ce2fde0e60f4176f5e470370def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 3 Aug 2023 23:44:08 +0200 Subject: [PATCH 1/3] Don't uses VU-Meter GL on Windows by default. Add option --enableVuMeterGL to override the default. --- src/util/cmdlineargs.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/util/cmdlineargs.cpp b/src/util/cmdlineargs.cpp index 7bb5fd15eaa..353e1e82d77 100644 --- a/src/util/cmdlineargs.cpp +++ b/src/util/cmdlineargs.cpp @@ -9,12 +9,23 @@ #include "sources/soundsourceproxy.h" #include "util/versionstore.h" +namespace { +#ifdef __WINDOWS__ +// We got reports that VuMetersGL do not perform good on windows. +// They improve the situation for macOS, the final fix is in Mixxx 2.4 +// See: https://github.com/mixxxdj/mixxx/issues/11785 +bool kUseVuMeterGlDefault = false; +#else +bool kUseVuMeterGlDefault = true; +#endif +} // namespace + CmdlineArgs::CmdlineArgs() : m_startInFullscreen(false), // Initialize vars m_midiDebug(false), m_developer(false), m_safeMode(false), - m_useVuMeterGL(true), + m_useVuMeterGL(kUseVuMeterGlDefault), m_debugAssertBreak(false), m_settingsPathSet(false), m_logLevel(mixxx::kLogLevelDefault), @@ -101,6 +112,9 @@ when a critical error occurs unless this is set properly.\n", stdout); } else if (QString::fromLocal8Bit(argv[i]).contains( "--disableVuMeterGL", Qt::CaseInsensitive)) { m_useVuMeterGL = false; + } else if (QString::fromLocal8Bit(argv[i]).contains( + "--enableVuMeterGL", Qt::CaseInsensitive)) { + m_useVuMeterGL = true; } else if (QString::fromLocal8Bit(argv[i]).contains( "--midiDebug", Qt::CaseInsensitive) || QString::fromLocal8Bit(argv[i]).contains( From f51abfbb91617a48d40b6a6d647b1835e69d9620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 4 Aug 2023 23:21:46 +0200 Subject: [PATCH 2/3] Use constexpr Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> --- src/util/cmdlineargs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/cmdlineargs.cpp b/src/util/cmdlineargs.cpp index 353e1e82d77..d3a83a02045 100644 --- a/src/util/cmdlineargs.cpp +++ b/src/util/cmdlineargs.cpp @@ -14,9 +14,9 @@ namespace { // We got reports that VuMetersGL do not perform good on windows. // They improve the situation for macOS, the final fix is in Mixxx 2.4 // See: https://github.com/mixxxdj/mixxx/issues/11785 -bool kUseVuMeterGlDefault = false; +constexpr bool kUseVuMeterGlDefault = false; #else -bool kUseVuMeterGlDefault = true; +constexpr bool kUseVuMeterGlDefault = true; #endif } // namespace From cca8b47706ed1464ddaa9caa73a0ff92852fafe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 4 Aug 2023 23:30:41 +0200 Subject: [PATCH 3/3] Add --enableVuMeterGL to -h output. --- src/util/cmdlineargs.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/cmdlineargs.cpp b/src/util/cmdlineargs.cpp index d3a83a02045..0e3f37d621f 100644 --- a/src/util/cmdlineargs.cpp +++ b/src/util/cmdlineargs.cpp @@ -177,6 +177,8 @@ void CmdlineArgs::printUsage() { \n\ --disableVuMeterGL Do not use OpenGL vu meter.\n\ \n\ +--enableVuMeterGL Use OpenGL vu meter.\n\ +\n\ --locale LOCALE Use a custom locale for loading translations\n\ (e.g 'fr')\n\ \n\