Browse Source

Fix running plugin bridges with empty filename

tags/1.9.5
falkTX 10 years ago
parent
commit
f6b1dbcacc
2 changed files with 8 additions and 4 deletions
  1. +1
    -1
      source/backend/engine/CarlaEngineBridge.cpp
  2. +7
    -3
      source/backend/plugin/CarlaPluginThread.cpp

+ 1
- 1
source/backend/engine/CarlaEngineBridge.cpp View File

@@ -701,7 +701,7 @@ protected:
case kPluginBridgeRtSetCVPool: {
const uint64_t poolSize(fShmRtControl.readULong());
CARLA_SAFE_ASSERT_BREAK(poolSize > 0);
fShmCVPool.data = (float*)jackbridge_shm_map(fShmCVPool.shm, static_cast<size_t>(poolSize));
//fShmCVPool.data = (float*)jackbridge_shm_map(fShmCVPool.shm, static_cast<size_t>(poolSize));
break;
}



+ 7
- 3
source/backend/plugin/CarlaPluginThread.cpp View File

@@ -138,10 +138,14 @@ void CarlaPluginThread::run()
}

String name(fPlugin->getName());
String filename(fPlugin->getFilename());

if (name.isEmpty())
name = "(none)";

if (filename.isEmpty())
filename = "\"\"";

if (fLabel.isEmpty())
fLabel = "\"\"";

@@ -252,7 +256,7 @@ void CarlaPluginThread::run()

case PLUGIN_THREAD_DSSI_GUI:
/* osc-url */ arguments.add(String(fEngine->getOscServerPathUDP()) + String("/") + String(fPlugin->getId()));
/* filename */ arguments.add(fPlugin->getFilename());
/* filename */ arguments.add(filename);
/* label */ arguments.add(fLabel.buffer());
/* ui-title */ arguments.add(name + String(" (GUI)"));
break;
@@ -267,13 +271,13 @@ void CarlaPluginThread::run()

case PLUGIN_THREAD_VST_GUI:
/* osc-url */ arguments.add(String(fEngine->getOscServerPathUDP()) + String("/") + String(fPlugin->getId()));
/* filename */ arguments.add(fPlugin->getFilename());
/* filename */ arguments.add(filename);
/* ui-title */ arguments.add(name + String(" (GUI)"));
break;

case PLUGIN_THREAD_BRIDGE:
/* stype */ arguments.add(fExtra1.buffer());
/* filename */ arguments.add(fPlugin->getFilename());
/* filename */ arguments.add(filename);
/* label */ arguments.add(fLabel.buffer());
/* uniqueId */ arguments.add(String(static_cast<juce::int64>(fPlugin->getUniqueId())));



Loading…
Cancel
Save