# HG changeset patch
# User Chris Cannam
# Date 1478009337 0
# Node ID a5db0b13aa25802a4e8a2513679c87998cb2a69c
# Parent  6e47bd2263e28716aaec9009583b9329032a073c# Parent  e93ad534c1cb2adb67326f12787618b8db7f499f
Merge from branch 3.0-integration

diff -r 6e47bd2263e2 -r a5db0b13aa25 .hgsubstate
--- 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
diff -r 6e47bd2263e2 -r a5db0b13aa25 main/main.cpp
--- 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");