Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable GL VU-Meters on windows by default. #11787

Merged
merged 3 commits into from
Aug 4, 2023
Merged

Disable GL VU-Meters on windows by default. #11787

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97b93eb
Don't uses VU-Meter GL on Windows by default. Add option --enableVuMe…
daschuer Aug 3, 2023
f51abfb
Use constexpr
daschuer Aug 4, 2023
cca8b47
Add --enableVuMeterGL to -h output.
daschuer Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/util/cmdlineargs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
constexpr bool kUseVuMeterGlDefault = false;
#else
constexpr 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),
Expand Down Expand Up @@ -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;
Comment on lines +115 to +117
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these are hidden from -h and so forth, is that intentional?

} else if (QString::fromLocal8Bit(argv[i]).contains(
"--midiDebug", Qt::CaseInsensitive) ||
QString::fromLocal8Bit(argv[i]).contains(
Expand Down Expand Up @@ -163,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\
Expand Down
Loading