Browse Source

Add "wine" before discovery and bridges commands (TESTING)

tags/1.9.4
falkTX 10 years ago
parent
commit
58ff34e07c
2 changed files with 11 additions and 1 deletions
  1. +10
    -1
      source/backend/plugin/CarlaPluginThread.cpp
  2. +1
    -0
      source/carla_database.py

+ 10
- 1
source/backend/plugin/CarlaPluginThread.cpp View File

@@ -188,8 +188,15 @@ void CarlaPluginThread::run()
env.insert("ENGINE_BRIDGE_CLIENT_NAME", name);
env.insert("ENGINE_BRIDGE_OSC_URL", QString("%1/%2").arg(fEngine->getOscServerPathUDP()).arg(fPlugin->getId()));

if (fPlugin->getType() != PLUGIN_JACK)
//if (fPlugin->getType() != PLUGIN_JACK)
{
#ifndef CARLA_OS_WIN
if (fBinary.endsWith(".exe"))
{
arguments << fBinary.buffer();
fBinary = "wine";
}
#endif
/* osc-url */ arguments << QString("%1/%2").arg(fEngine->getOscServerPathUDP()).arg(fPlugin->getId());
/* stype */ arguments << fExtra1.buffer();
/* filename */ arguments << fPlugin->getFilename();
@@ -197,12 +204,14 @@ void CarlaPluginThread::run()
/* label */ arguments << fLabel.buffer();
/* uniqueId */ arguments << QString("%1").arg(fPlugin->getUniqueId());
}
#if 0
else
{
env.insert("LD_LIBRARY_PATH", "/home/falktx/FOSS/GIT-mine/Carla/source/bridges/jackplugin/");
carla_stdout("JACK app bridge here, filename: %s", fPlugin->getFilename());
fBinary = fPlugin->getFilename();
}
#endif
break;
}



+ 1
- 0
source/carla_database.py View File

@@ -162,6 +162,7 @@ def runCarlaDiscovery(itype, stype, filename, tool, isWine=False):
command.append("LANG=C")
if isWine:
command.append("WINEDEBUG=-all")
command.append("wine")

command.append(tool)
command.append(stype)


Loading…
Cancel
Save