comparison main/main.cpp @ 1149:3ba5bee2ace0 3.0-integration

Merge from branch pluginscan
author Chris Cannam
date Fri, 15 Apr 2016 16:26:15 +0100
parents b3b5885e7c2c
children 2e83525cf638
comparison
equal deleted inserted replaced
1143:129910eddd00 1149:3ba5bee2ace0
24 #include "data/fileio/FileSource.h" 24 #include "data/fileio/FileSource.h"
25 #include "widgets/TipDialog.h" 25 #include "widgets/TipDialog.h"
26 #include "widgets/InteractiveFileFinder.h" 26 #include "widgets/InteractiveFileFinder.h"
27 #include "svapp/framework/TransformUserConfigurator.h" 27 #include "svapp/framework/TransformUserConfigurator.h"
28 #include "transform/TransformFactory.h" 28 #include "transform/TransformFactory.h"
29 #include "svcore/plugin/PluginScan.h"
29 30
30 #include <QMetaType> 31 #include <QMetaType>
31 #include <QApplication> 32 #include <QApplication>
32 #include <QDesktopWidget> 33 #include <QDesktopWidget>
33 #include <QMessageBox> 34 #include <QMessageBox>
330 SVDEBUG << "Done" << endl; 331 SVDEBUG << "Done" << endl;
331 application.installTranslator(&svTranslator); 332 application.installTranslator(&svTranslator);
332 333
333 StoreStartupLocale(); 334 StoreStartupLocale();
334 335
336 // Make known-plugins query as early as possible after showing
337 // splash screen. This depends on our helper executable, which
338 // must exist either in the same directory as this one or
339 // (preferably) a subdirectory called "checker".
340 QString myDir = application.applicationDirPath();
341 QString helperPath = myDir + "/checker/plugin-checker-helper";
342 QString helperSuffix = "";
343 #ifdef _WIN32
344 helperSuffix = ".exe";
345 #endif
346 if (!QFile(helperPath + helperSuffix).exists()) {
347 helperPath = myDir + "/plugin-checker-helper";
348 }
349 helperPath += helperSuffix;
350 PluginScan::getInstance()->scan(helperPath);
351
335 // Permit size_t and PropertyName to be used as args in queued signal calls 352 // Permit size_t and PropertyName to be used as args in queued signal calls
336 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); 353 qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");
337 354
338 MainWindow::SoundOptions options = MainWindow::WithEverything; 355 MainWindow::SoundOptions options = MainWindow::WithEverything;
339 if (!audioOutput) options = 0; 356 if (!audioOutput) options = 0;