Mercurial > hg > sonic-visualiser
changeset 1307:e93ad534c1cb 3.0-integration
Support multiple plugin checker helpers, as for multiple piper servers
| author | Chris Cannam |
|---|---|
| date | Tue, 01 Nov 2016 14:06:47 +0000 |
| parents | 6038fb7a8f09 |
| children | a5db0b13aa25 e03b2644c0ed |
| files | .hgsubstate main/main.cpp |
| diffstat | 2 files changed, 3 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Tue Nov 01 12:09:05 2016 +0000 +++ b/.hgsubstate Tue Nov 01 14:06:47 2016 +0000 @@ -7,6 +7,6 @@ bcfadce0b8acf66565fadfe50f3aaffbeb6e5c1c piper-cpp e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds e59e66d8208d89f38c8cfda0a29cdda48056b32d svapp -42a4b058f8ba26c7bf35edf70784a1934e6b4d47 svcore +c6bdf247016a9f264a05082f9725b93171d17dac svcore 8a5f0c8d56089170062e94c70f369292b06a6c12 svgui 79a219ba617862adffd78925f1571e5c96760e0a vamp-plugin-sdk
--- a/main/main.cpp Tue Nov 01 12:09:05 2016 +0000 +++ b/main/main.cpp Tue Nov 01 14:06:47 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");