Browse Source

Don't use /usr/bin/wine-rt, set WINE_RT instead if not done yet

tags/1.9.7
falkTX 10 years ago
parent
commit
55848e58fc
2 changed files with 10 additions and 8 deletions
  1. +9
    -2
      source/backend/CarlaStandalone.cpp
  2. +1
    -6
      source/backend/plugin/CarlaPluginBridge.cpp

+ 9
- 2
source/backend/CarlaStandalone.cpp View File

@@ -284,8 +284,8 @@ bool carla_engine_init(const char* driverName, const char* clientName)
// TODO: make this an option, put somewhere else
if (std::getenv("WINE_RT") == nullptr)
{
carla_setenv("WINE_RT", "15");
carla_setenv("WINE_SVR_RT", "10");
carla_setenv("WINE_RT", "55");
carla_setenv("WINE_SVR_RT", "70");
}

gStandalone.engine = CarlaEngine::newDriverByName(driverName);
@@ -345,6 +345,13 @@ bool carla_engine_init_bridge(const char audioBaseName[6+1], const char rtClient
return false;
}

// TODO: make this an option, put somewhere else
if (std::getenv("WINE_RT") == nullptr)
{
carla_setenv("WINE_RT", "55");
carla_setenv("WINE_SVR_RT", "70");
}

gStandalone.engine = CarlaEngine::newBridge(audioBaseName, rtClientBaseName, nonRtClientBaseName, nonRtServerBaseName);

if (gStandalone.engine == nullptr)


+ 1
- 6
source/backend/plugin/CarlaPluginBridge.cpp View File

@@ -547,12 +547,7 @@ protected:
#ifndef CARLA_OS_WIN
// start with "wine" if needed
if (fBinary.endsWithIgnoreCase(".exe"))
{
if (File("/usr/bin/wine-rt").existsAsFile())
arguments.add("wine-rt");
else
arguments.add("wine");
}
arguments.add("wine");
#endif

// binary


Loading…
Cancel
Save