Browse Source

Carla: Remove hack for rncbc plugins, fixed upstream

tags/v0.9.0
falkTX 12 years ago
parent
commit
6603e5e20b
2 changed files with 4 additions and 23 deletions
  1. +4
    -0
      c++/carla-engine/carla_engine_osc.cpp
  2. +0
    -23
      c++/carla-plugin/lv2.cpp

+ 4
- 0
c++/carla-engine/carla_engine_osc.cpp View File

@@ -391,6 +391,10 @@ int CarlaEngineOsc::handleMsgConfigure(CARLA_ENGINE_OSC_HANDLE_ARGS2)
const char* const key = (const char*)&argv[0]->s;
const char* const value = (const char*)&argv[1]->s;

#ifdef DEBUG
qDebug("CarlaEngineOsc::handleMsgConfigure(\"%s\", \"%s\")", key, value);
#endif

plugin->setCustomData(CUSTOM_DATA_STRING, key, value, false);

return 0;


+ 0
- 23
c++/carla-plugin/lv2.cpp View File

@@ -262,8 +262,6 @@ public:
lastTimePosPlaying = false;
lastTimePosFrame = 0;

needsMidiConnectHack = false;

for (uint32_t i=0; i < CARLA_URI_MAP_ID_COUNT; i++)
customURIDs.push_back(nullptr);

@@ -2597,20 +2595,6 @@ public:
}
}

// HACK: rncbc's plugins require midi connect_port before each run()
if (needsMidiConnectHack)
{
for (i=0; i < evIn.count; i++)
{
if (evIn.data[i].type & CARLA_EVENT_DATA_ATOM)
descriptor->connect_port(handle, evIn.data[i].rindex, evIn.data[i].atom);
else if (evIn.data[i].type & CARLA_EVENT_DATA_EVENT)
descriptor->connect_port(handle, evIn.data[i].rindex, evIn.data[i].event);
else if (evIn.data[i].type & CARLA_EVENT_DATA_MIDI_LL)
descriptor->connect_port(handle, evIn.data[i].rindex, evIn.data[i].midi);
}
}

for (i=0; i < aIn.count; i++)
{
if (i == 0 || ! h2) descriptor->connect_port(handle, aIn.rindexes[i], inBuffer[i]);
@@ -4181,10 +4165,6 @@ public:
return false;
}

// HACK: rncbc's plugins require midi connect_port before each run()
if (strcmp(rdf_descriptor->Author, "rncbc aka. Rui Nuno Capela") == 0)
needsMidiConnectHack = true;

// ---------------------------------------------------------------
// get info

@@ -4603,9 +4583,6 @@ private:
bool lastTimePosPlaying;
uint32_t lastTimePosFrame;

// HACK: rncbc's plugins require midi connect_port before each run()
bool needsMidiConnectHack;

static unsigned int m_count;
static std::set<const LV2_Lib_Descriptor*> libDescs;



Loading…
Cancel
Save