From 7ce954d089e3fb76467699cd2079dbe240bd4097 Mon Sep 17 00:00:00 2001 From: elieserdejesus Date: Sat, 28 Nov 2015 17:14:16 -0200 Subject: [PATCH] fix Vst Scanning in windows --- Client/VstScanner/WindowsVstPluginScanner.cpp | 2 +- Client/src/StandAloneMainController.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Client/VstScanner/WindowsVstPluginScanner.cpp b/Client/VstScanner/WindowsVstPluginScanner.cpp index 061e1291d..57da6e46f 100644 --- a/Client/VstScanner/WindowsVstPluginScanner.cpp +++ b/Client/VstScanner/WindowsVstPluginScanner.cpp @@ -78,5 +78,5 @@ Audio::PluginDescriptor VstPluginScanner::getPluginDescriptor(QFileInfo f){ bool VstPluginScanner::isVstPluginFile(QString path){ QFileInfo file(path); - return file.isFile() && QLibrary.isLibrary(path); + return file.isFile() && QLibrary::isLibrary(path); } diff --git a/Client/src/StandAloneMainController.cpp b/Client/src/StandAloneMainController.cpp index 509ca0f62..4d8791167 100644 --- a/Client/src/StandAloneMainController.cpp +++ b/Client/src/StandAloneMainController.cpp @@ -56,7 +56,7 @@ void StandalonePluginFinder::on_processFinished(){ void StandalonePluginFinder::on_processError(QProcess::ProcessError error){ - qCritical(jtStandalonePluginFinder) << "ERROR:" << error << scanProcess.errorString(); + qCritical() << "ERROR:" << error << scanProcess.errorString(); on_processFinished(); } @@ -69,6 +69,9 @@ void StandalonePluginFinder::handleProcessError(QString lastScannedPlugin){ QString StandalonePluginFinder::getVstScannerExecutablePath() const{ //try the same jamtaba executable path first QString scannerExeName = "VstScanner";//In the deploy version the VstScanner and Jamtaba2 executables are in the same folder. +#ifdef Q_OS_WIN + scannerExeName += ".exe"; +#endif if(QFile(scannerExeName).exists()){ return scannerExeName; } @@ -132,7 +135,7 @@ void StandalonePluginFinder::scan(QStringList blackList){ QString scannerExePath = getVstScannerExecutablePath(); if(scannerExePath.isEmpty()){ - return;//scanner exe not found! + return;//scanner executable not found! } emit scanStarted();