From 809d32938197b1fcdcd191f29abb864f7bd4246e Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 8 Feb 2014 07:55:48 +0000 Subject: [PATCH] Fix discovery skipping of linuxsampler and fluidsynth based plugs --- source/discovery/carla-discovery.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp index 5ef6f62b1..a85d619a4 100644 --- a/source/discovery/carla-discovery.cpp +++ b/source/discovery/carla-discovery.cpp @@ -1527,6 +1527,20 @@ int main(int argc, char* argv[]) const char* const filename = argv[2]; const PluginType type = getPluginTypeFromString(stype); + CarlaString filenameStr(filename); + filenameStr.toLower(); + + if (filenameStr.contains("fluidsynth", true)) + { + DISCOVERY_OUT("info", "skipping fluidsynth based plugin"); + return 0; + } + if (filenameStr.contains("linuxsampler", true) || filenameStr.endsWith("ls16.so")) + { + DISCOVERY_OUT("info", "skipping linuxsampler based plugin"); + return 0; + } + bool openLib = false; void* handle = nullptr; @@ -1550,20 +1564,6 @@ int main(int argc, char* argv[]) print_lib_error(filename); return 1; } - - CarlaString filenameStr(filename); - filenameStr.toLower(); - - if (filenameStr.contains("fluidsynth", true)) - { - DISCOVERY_OUT("info", "skipping fluidsynth based plugin"); - return 0; - } - if (filenameStr.contains("linuxsampler", true) || filenameStr.endsWith("ls16.so")) - { - DISCOVERY_OUT("info", "skipping linuxsampler based plugin"); - return 0; - } } // never do init for dssi-vst, takes too long and it's crashy