razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix autodetect 3rd party

Browse source
This commit is contained in:
manongjohn 2023-03-20 21:18:15 -04:00
parent 74142e2c7f
commit b1f909b92d
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
toonz/sources/toonzlib/thirdparty.cpp
View file

@ -75,7 +75,15 @@ bool findFFmpeg(QString dir) {
bool checkFFmpeg() { bool checkFFmpeg() {
// Path in preferences // Path in preferences
return findFFmpeg(Preferences::instance()->getFfmpegPath()); bool found = findFFmpeg(Preferences::instance()->getFfmpegPath());
if (found) return true;
QString path = autodetectFFmpeg();
if (path.isEmpty()) return false;
setFFmpegDir(path);
return true;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -149,8 +157,8 @@ void setFFmpegTimeout(int secs) {
void runFFmpeg(QProcess &process, const QStringList &arguments) { void runFFmpeg(QProcess &process, const QStringList &arguments) {
QString dir = Preferences::instance()->getFfmpegPath(); QString dir = Preferences::instance()->getFfmpegPath();
if (dir.at(0) == '.') // Relative path // if (dir.at(0) == '.') // Relative path
dir = QCoreApplication::applicationDirPath() + "/" + dir; // dir = QCoreApplication::applicationDirPath() + "/" + dir;
process.start(dir + FFMPEG_EXE, arguments); process.start(dir + FFMPEG_EXE, arguments);
} }
@ -159,8 +167,8 @@ void runFFmpeg(QProcess &process, const QStringList &arguments) {
void runFFprobe(QProcess &process, const QStringList &arguments) { void runFFprobe(QProcess &process, const QStringList &arguments) {
QString dir = Preferences::instance()->getFfmpegPath(); QString dir = Preferences::instance()->getFfmpegPath();
if (dir.at(0) == '.') // Relative path // if (dir.at(0) == '.') // Relative path
dir = QCoreApplication::applicationDirPath() + "/" + dir; // dir = QCoreApplication::applicationDirPath() + "/" + dir;
process.start(dir + FFPROBE_EXE, arguments); process.start(dir + FFPROBE_EXE, arguments);
} }
@ -240,7 +248,14 @@ bool findRhubarb(QString dir) {
bool checkRhubarb() { bool checkRhubarb() {
// Path in preferences // Path in preferences
return findRhubarb(Preferences::instance()->getRhubarbPath()); bool found = findRhubarb(Preferences::instance()->getRhubarbPath());
if (found) return true;
QString path = autodetectRhubarb();
if (path.isEmpty()) return false;
setRhubarbDir(path);
return true;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -291,8 +306,8 @@ QString autodetectRhubarb() {
void runRhubarb(QProcess &process, const QStringList &arguments) { void runRhubarb(QProcess &process, const QStringList &arguments) {
QString dir = Preferences::instance()->getRhubarbPath(); QString dir = Preferences::instance()->getRhubarbPath();
if (dir.at(0) == '.') // Relative path // if (dir.at(0) == '.') // Relative path
dir = QCoreApplication::applicationDirPath() + "/" + dir; // dir = QCoreApplication::applicationDirPath() + "/" + dir;
process.start(dir + RHUBARB_EXE, arguments); process.start(dir + RHUBARB_EXE, arguments);
} }