Mercurial > hg > sonic-visualiser
changeset 1308:a5db0b13aa25 piper
Merge from branch 3.0-integration
| author | Chris Cannam |
|---|---|
| date | Tue, 01 Nov 2016 14:08:57 +0000 |
| parents | 6e47bd2263e2 (current diff) e93ad534c1cb (diff) |
| children | d8ba78ce849c |
| files | .hgsubstate |
| diffstat | 2 files changed, 5 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Fri Oct 28 15:19:12 2016 +0100 +++ b/.hgsubstate Tue Nov 01 14:08:57 2016 +0000 @@ -6,7 +6,7 @@ 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable bcfadce0b8acf66565fadfe50f3aaffbeb6e5c1c piper-cpp e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds -227291052aa9359633ca9183328daf3daaed0d7e svapp -dd49630e0d7070276e33465db43269363df06c18 svcore -8e4b90aeefaa58a1744f0291768ce03e1652f3a1 svgui +9d067d65fe3f94033f5e4c80fc2f4475d484f556 svapp +c401e738793f2de89d7b63a7948c7831966a44e6 svcore +8a5f0c8d56089170062e94c70f369292b06a6c12 svgui 79a219ba617862adffd78925f1571e5c96760e0a vamp-plugin-sdk
--- a/main/main.cpp Fri Oct 28 15:19:12 2016 +0100 +++ b/main/main.cpp Tue Nov 01 14:08:57 2016 +0000 @@ -342,26 +342,8 @@ StoreStartupLocale(); // Make known-plugins query as early as possible after showing - // splash screen. This depends on our helper executable, which - // must exist either in the same directory as this one or - // (preferably) a subdirectory called "checker". - QString myDir = application.applicationDirPath(); - QString helperPath = myDir + "/checker/plugin-checker-helper"; - QString helperSuffix = ""; -#ifdef _WIN32 - helperSuffix = ".exe"; -#endif - if (!QFile(helperPath + helperSuffix).exists()) { - cerr << "NOTE: helper not found at " << (helperPath + helperSuffix) - << ", trying in my own directory" << endl; - helperPath = myDir + "/plugin-checker-helper"; - } - if (!QFile(helperPath + helperSuffix).exists()) { - cerr << "NOTE: helper not found at " << (helperPath + helperSuffix) - << endl; - } - helperPath += helperSuffix; - PluginScan::getInstance()->scan(helperPath); + // splash screen. + PluginScan::getInstance()->scan(); // Permit size_t and PropertyName to be used as args in queued signal calls qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName");