Commit 3eee3d5c authored by Julius Künzel's avatar Julius Künzel
Browse files

Merge branch 'refs/heads/release/21.12'

parents 73d0cf75 ade1c515
Pipeline #123573 passed with stage
in 5 minutes and 15 seconds
......@@ -522,8 +522,6 @@ void Wizard::checkMltComponents()
void Wizard::slotCheckPrograms(QString &infos, QString &warnings)
{
bool allIsOk = true;
// Check first in same folder as melt exec
const QStringList mltpath({QFileInfo(KdenliveSettings::rendererpath()).canonicalPath(), qApp->applicationDirPath()});
QString exepath;
......@@ -538,7 +536,6 @@ void Wizard::slotCheckPrograms(QString &infos, QString &warnings)
exepath = QStandardPaths::findExecutable(QStringLiteral("avconv"));
if (exepath.isEmpty()) {
warnings.append(i18n("<li>Missing app: <b>ffmpeg</b><br/>required for proxy clips and transcoding</li>"));
allIsOk = false;
}
}
}
......@@ -612,10 +609,24 @@ void Wizard::slotCheckPrograms(QString &infos, QString &warnings)
KdenliveSettings::setDefaultaudioapp(program);
}
}
if (allIsOk) {
// OK
} else {
// WRONG
if (KdenliveSettings::defaultaudioapp().isEmpty()) {
program = QStandardPaths::findExecutable(QStringLiteral("audacity"));
if (program.isEmpty()) {
program = QStandardPaths::findExecutable(QStringLiteral("traverso"));
}
if (!program.isEmpty()) {
KdenliveSettings::setDefaultaudioapp(program);
}
}
if (KdenliveSettings::mediainfopath().isEmpty() || !QFileInfo::exists(KdenliveSettings::mediainfopath())) {
program = QStandardPaths::findExecutable(QStringLiteral("mediainfo"));
if (program.isEmpty()) {
infos.append(i18n("<li>Missing app: <b>mediainfo</b><br/>optional for technical clip information/li>"));
} else {
KdenliveSettings::setMediainfopath(program);
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment