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

Add lost timelinePath and logFlushLevel parsing #4022

Merged
merged 2 commits into from
Jun 21, 2021
Merged

Add lost timelinePath and logFlushLevel parsing #4022

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92b52c1
Added lost timelinePath and logFlushLevel parsing
daschuer Jun 21, 2021
9a44f0e
Limit parser error message line length to < 80
daschuer Jun 21, 2021
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
16 changes: 14 additions & 2 deletions src/util/cmdlineargs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,10 @@ bool CmdlineArgs::parse(int& argc, char** argv) {
m_resourcePath = parser.value(resourcePath);
}

if (parser.isSet(timelinePath)) {
m_timelinePath = parser.value(timelinePath);
}

m_midiDebug = parser.isSet(controllerDebug);
m_developer = parser.isSet(developer);
m_safeMode = parser.isSet(safeMode);
Expand All @@ -234,8 +238,8 @@ bool CmdlineArgs::parse(int& argc, char** argv) {

if (parser.isSet(logLevel)) {
if (!parseLogLevel(parser.value(logLevel), &m_logLevel)) {
fputs("\nlogLevel argument wasn't 'trace', 'debug', 'info', 'warning', or 'critical'! Mixxx will only output\n\
warnings and errors to the console unless this is set properly.\n",
fputs("\nlog-level wasn't 'trace', 'debug', 'info', 'warning', or 'critical'!\n"
"Mixxx will only print warnings and critical messages to the console.\n",
stdout);
}
} else {
Expand All @@ -244,6 +248,14 @@ warnings and errors to the console unless this is set properly.\n",
}
}

if (parser.isSet(logFlushLevel)) {
if (!parseLogLevel(parser.value(logFlushLevel), &m_logFlushLevel)) {
fputs("\nlog-flush-level wasn't 'trace', 'debug', 'info', 'warning', or 'critical'!\n"
"Mixxx will only flush output after a critical message.\n",
stdout);
}
}

// set colors
if (parser.value(color).compare(QLatin1String("auto"), Qt::CaseInsensitive) == 0) {
// see https://no-color.org/
Expand Down