From eaa866779dc76d6a9fd640a16d092471d93f8151 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 26 Oct 2013 12:30:11 +0100 Subject: [PATCH] Cleanup --- source/carla_database.py | 10 ---------- source/discovery/carla-discovery.cpp | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/source/carla_database.py b/source/carla_database.py index d65607596..11bcbb081 100755 --- a/source/carla_database.py +++ b/source/carla_database.py @@ -169,22 +169,12 @@ def runCarlaDiscovery(itype, stype, filename, tool, isWine=False): plugins = [] fakeLabel = os.path.basename(filename).rsplit(".", 1)[0] - #try: - #gDiscoveryProcess.wait() - #output = gDiscoveryProcess.stdout.read().decode("utf-8", errors="ignore").split("\n") - #except: - #output = () - - #for line in output: - while gDiscoveryProcess.poll() is None: try: line = gDiscoveryProcess.stdout.readline().decode("utf-8", errors="ignore").strip() except: break - #line = line.strip() - if line == "carla-discovery::init::-----------": pinfo = deepcopy(PyPluginInfo) pinfo['type'] = itype diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp index feb36ce3c..14aeee332 100644 --- a/source/discovery/carla-discovery.cpp +++ b/source/discovery/carla-discovery.cpp @@ -20,8 +20,6 @@ #include "CarlaString.hpp" #include "CarlaMIDI.h" -#define VST_FORCE_DEPRECATED 0 - #ifdef WANT_LADSPA # include "CarlaLadspaUtils.hpp" #endif @@ -1484,6 +1482,7 @@ void do_fluidsynth_check(const char* const filename, const bool init) DISCOVERY_OUT("label", (const char*)label); DISCOVERY_OUT("maker", ""); DISCOVERY_OUT("copyright", ""); + DISCOVERY_OUT("hints", PLUGIN_IS_SYNTH); DISCOVERY_OUT("audio.outs", 2); DISCOVERY_OUT("audio.total", 2); DISCOVERY_OUT("midi.ins", 1);