Browse Source

Fix lrdf issue on cxfreeze builds; Misc fixes

tags/1.9.4
falkTX 10 years ago
parent
commit
54b675590d
2 changed files with 26 additions and 24 deletions
  1. +14
    -7
      source/carla_database.py
  2. +12
    -17
      source/utils/CarlaPipeUtils.hpp

+ 14
- 7
source/carla_database.py View File

@@ -59,7 +59,10 @@ except:
if haveLRDF and readEnvVars:
LADSPA_RDF_PATH_env = os.getenv("LADSPA_RDF_PATH")
if LADSPA_RDF_PATH_env:
ladspa_rdf.set_rdf_path(LADSPA_RDF_PATH_env.split(splitter))
try:
ladspa_rdf.set_rdf_path(LADSPA_RDF_PATH_env.split(splitter))
except:
pass
del LADSPA_RDF_PATH_env

# ------------------------------------------------------------------------------------------------------------
@@ -516,12 +519,16 @@ class SearchPluginsThread(QThread):
startValue = self.fLastCheckValue - rdfPadValue

self._pluginLook(startValue, "LADSPA RDFs...")
ladspaRdfInfo = ladspa_rdf.recheck_all_plugins(self, startValue, self.fCurPercentValue, checkValue)

settingsDir = os.path.join(HOME, ".config", "falkTX")
fdLadspa = open(os.path.join(settingsDir, "ladspa_rdf.db"), 'w')
json.dump(ladspaRdfInfo, fdLadspa)
fdLadspa.close()
try:
ladspaRdfInfo = ladspa_rdf.recheck_all_plugins(self, startValue, self.fCurPercentValue, checkValue)
except:
ladspaRdfInfo = None

if ladspaRdfInfo is not None:
settingsDir = os.path.join(HOME, ".config", "falkTX")
fdLadspa = open(os.path.join(settingsDir, "ladspa_rdf.db"), 'w')
json.dump(ladspaRdfInfo, fdLadspa)
fdLadspa.close()

if not self.fContinueChecking: return



+ 12
- 17
source/utils/CarlaPipeUtils.hpp View File

@@ -75,26 +75,21 @@ public:

//----------------------------------------------------------------

const char* argv[7];
const char* argv[6];

//----------------------------------------------------------------
// argv[0] => python
// argv[0] => filename

argv[0] = "/usr/bin/python3";
argv[0] = filename;

//----------------------------------------------------------------
// argv[1] => filename
// argv[1-2] => args

argv[1] = filename;
argv[1] = arg1;
argv[2] = arg2;

//----------------------------------------------------------------
// argv[2-3] => args

argv[2] = arg1;
argv[3] = arg2;

//----------------------------------------------------------------
// argv[4-5] => pipes
// argv[3-4] => pipes

int pipe1[2]; // written by host process, read by plugin UI process
int pipe2[2]; // written by plugin UI process, read by host process
@@ -124,13 +119,13 @@ public:
pipeRecv[100] = '\0';
pipeSend[100] = '\0';

argv[4] = pipeRecv; // reading end
argv[5] = pipeSend; // writting end
argv[3] = pipeRecv; // reading end
argv[4] = pipeSend; // writting end

//----------------------------------------------------------------
// argv[6] => null
// argv[5] => null

argv[6] = nullptr;
argv[5] = nullptr;

//----------------------------------------------------------------
// fork
@@ -591,7 +586,7 @@ private:

// -------------------------------------------------------------------

static bool fork_exec(const char* const argv[7], int* const retp) noexcept
static bool fork_exec(const char* const argv[6], int* const retp) noexcept
{
const pid_t ret = *retp = vfork();



Loading…
Cancel
Save