Browse Source

carla-vst: Remove special tracktion fix, not needed with >= 6.1.5

tags/1.9.7
falkTX 10 years ago
parent
commit
d9b781951c
3 changed files with 0 additions and 51 deletions
  1. +0
    -25
      source/backend/engine/CarlaEngineNative.cpp
  2. +0
    -2
      source/native-plugins/resources/carla-plugin
  3. +0
    -24
      source/plugin/carla-vst.cpp

+ 0
- 25
source/backend/engine/CarlaEngineNative.cpp View File

@@ -64,7 +64,6 @@ class CarlaEngineNativeUI : public CarlaExternalUI
public:
CarlaEngineNativeUI(CarlaEngine* const engine)
: fEngine(engine),
fIsReady(false),
leakDetector_CarlaEngineNativeUI()
{
carla_debug("CarlaEngineNativeUI::CarlaEngineNativeUI(%p)", engine);
@@ -75,11 +74,6 @@ public:
carla_debug("CarlaEngineNativeUI::~CarlaEngineNativeUI()");
}

bool isReady() const noexcept
{
return fIsReady;
}

protected:
bool msgReceived(const char* const msg) noexcept override
{
@@ -537,10 +531,6 @@ protected:
if (CarlaPlugin* const plugin = fEngine->getPlugin(pluginId))
plugin->showCustomUI(yesNo);
}
else if (std::strcmp(msg, "ready") == 0)
{
fIsReady = true;
}
else
{
carla_stderr("CarlaEngineNativeUI::msgReceived : %s", msg);
@@ -560,7 +550,6 @@ protected:

private:
CarlaEngine* const fEngine;
bool fIsReady;

CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaEngineNativeUI)
};
@@ -578,7 +567,6 @@ public:
fIsRunning(false),
fUiServer(this),
fOptionsForced(false),
fWaitForReadyMsg(false),
leakDetector_CarlaEngineNative()
{
carla_debug("CarlaEngineNative::CarlaEngineNative()");
@@ -1510,16 +1498,6 @@ protected:

if (kIsPatchbay)
patchbayRefresh(false);

if (fWaitForReadyMsg)
{
carla_stdout("Using Carla plugin embedded in Tracktion, waiting for it to be ready...");

for (; fUiServer.isPipeRunning() && ! fUiServer.isReady();)
fUiServer.idlePipe();

carla_stdout("Done!");
}
}
else
{
@@ -1778,8 +1756,6 @@ public:
switch(opcode)
{
case NATIVE_PLUGIN_OPCODE_NULL:
if (static_cast<uint32_t>(index) == 0xDEADF00D && value == 0xC0C0B00B)
handlePtr->fWaitForReadyMsg = true;
return 0;
case NATIVE_PLUGIN_OPCODE_BUFFER_SIZE_CHANGED:
CARLA_SAFE_ASSERT_RETURN(value > 0, 0);
@@ -1823,7 +1799,6 @@ private:
CarlaEngineNativeUI fUiServer;

bool fOptionsForced;
bool fWaitForReadyMsg;
char fTmpBuf[STR_MAX+1];

CarlaPlugin* _getFirstPlugin() const noexcept


+ 0
- 2
source/native-plugins/resources/carla-plugin View File

@@ -428,8 +428,6 @@ if LINUX and not config_UseQt5:
self.embedInto(winId)
self.show()

self.gui.send(["ready"])

def addShortcutActions(self, actions):
for action in actions:
if not action.shortcut().isEmpty():


+ 0
- 24
source/plugin/carla-vst.cpp View File

@@ -268,36 +268,12 @@ public:
// set CARLA_PLUGIN_EMBED_WINID for external process
carla_setenv("CARLA_PLUGIN_EMBED_WINID", strBuf);

// check if vst host is tracktion
carla_zeroChar(strBuf, 0xff+1);
hostCallback(audioMasterGetProductString, 0, 0, strBuf, 0.0f);

const bool isTracktion(std::strcmp(strBuf, "Tracktion") == 0);

// if vst host is tracktion, delay UI appearance for a bit (part 1)
if (isTracktion)
{
fDescriptor->dispatcher(fHandle, NATIVE_PLUGIN_OPCODE_NULL, (int32_t)0xDEADF00D, 0xC0C0B00B, nullptr, 0.0f);
}

// show UI now
fDescriptor->ui_show(fHandle, true);

// reset CARLA_PLUGIN_EMBED_WINID just in case
carla_setenv("CARLA_PLUGIN_EMBED_WINID", "0");

// if vst host is tracktion, delay UI appearance for a bit (part 2)
if (isTracktion)
{
carla_stdout("Tracktion detected, delaying UI appearance so it works properly...");

for (int x=10; --x>=0;)
{
hostCallback(audioMasterIdle);
carla_msleep(25);
}
}

ret = 1;
}
break;


Loading…
Cancel
Save