Browse Source

Cleanup

tags/1.9.4
falkTX 11 years ago
parent
commit
eaa866779d
2 changed files with 1 additions and 12 deletions
  1. +0
    -10
      source/carla_database.py
  2. +1
    -2
      source/discovery/carla-discovery.cpp

+ 0
- 10
source/carla_database.py View File

@@ -169,22 +169,12 @@ def runCarlaDiscovery(itype, stype, filename, tool, isWine=False):
plugins = [] plugins = []
fakeLabel = os.path.basename(filename).rsplit(".", 1)[0] 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: while gDiscoveryProcess.poll() is None:
try: try:
line = gDiscoveryProcess.stdout.readline().decode("utf-8", errors="ignore").strip() line = gDiscoveryProcess.stdout.readline().decode("utf-8", errors="ignore").strip()
except: except:
break break


#line = line.strip()

if line == "carla-discovery::init::-----------": if line == "carla-discovery::init::-----------":
pinfo = deepcopy(PyPluginInfo) pinfo = deepcopy(PyPluginInfo)
pinfo['type'] = itype pinfo['type'] = itype


+ 1
- 2
source/discovery/carla-discovery.cpp View File

@@ -20,8 +20,6 @@
#include "CarlaString.hpp" #include "CarlaString.hpp"
#include "CarlaMIDI.h" #include "CarlaMIDI.h"


#define VST_FORCE_DEPRECATED 0

#ifdef WANT_LADSPA #ifdef WANT_LADSPA
# include "CarlaLadspaUtils.hpp" # include "CarlaLadspaUtils.hpp"
#endif #endif
@@ -1484,6 +1482,7 @@ void do_fluidsynth_check(const char* const filename, const bool init)
DISCOVERY_OUT("label", (const char*)label); DISCOVERY_OUT("label", (const char*)label);
DISCOVERY_OUT("maker", ""); DISCOVERY_OUT("maker", "");
DISCOVERY_OUT("copyright", ""); DISCOVERY_OUT("copyright", "");
DISCOVERY_OUT("hints", PLUGIN_IS_SYNTH);
DISCOVERY_OUT("audio.outs", 2); DISCOVERY_OUT("audio.outs", 2);
DISCOVERY_OUT("audio.total", 2); DISCOVERY_OUT("audio.total", 2);
DISCOVERY_OUT("midi.ins", 1); DISCOVERY_OUT("midi.ins", 1);


Loading…
Cancel
Save