Browse Source

Always copy carla-plugin binary when exporting lv2 plugin

Signed-off-by: falkTX <falktx@gmail.com>
tags/v1.9.14
falkTX 5 years ago
parent
commit
570b8d5976
2 changed files with 1 additions and 10 deletions
  1. +1
    -7
      source/backend/plugin/CarlaPlugin.cpp
  2. +0
    -3
      source/bridges-plugin/CarlaBridgeSingleLV2.cpp

+ 1
- 7
source/backend/plugin/CarlaPlugin.cpp View File

@@ -1232,13 +1232,13 @@ bool CarlaPlugin::exportAsLV2(const char* const lv2path)
const CarlaString binFolderTarget(bundlepath + CARLA_OS_SEP_STR + "bin"); const CarlaString binFolderTarget(bundlepath + CARLA_OS_SEP_STR + "bin");
const CarlaString resFolderTarget(bundlepath + CARLA_OS_SEP_STR + "res"); const CarlaString resFolderTarget(bundlepath + CARLA_OS_SEP_STR + "res");


#ifdef CARLA_OS_WIN
if (! binaryFileSource.copyFileTo(binaryFileTarget)) if (! binaryFileSource.copyFileTo(binaryFileTarget))
{ {
pData->engine->setLastError("Failed to copy plugin binary"); pData->engine->setLastError("Failed to copy plugin binary");
return false; return false;
} }


#ifdef CARLA_OS_WIN
File(opts.resourceDir).copyDirectoryTo(File(resFolderTarget.buffer())); File(opts.resourceDir).copyDirectoryTo(File(resFolderTarget.buffer()));


// Copying all the binaries is pointless, just go through the expected needed bits // Copying all the binaries is pointless, just go through the expected needed bits
@@ -1257,12 +1257,6 @@ bool CarlaPlugin::exportAsLV2(const char* const lv2path)
for (int i=0; i<5; ++i) for (int i=0; i<5; ++i)
binFolder1.getChildFile(files[i]).copyFileTo(binFolder2.getChildFile(files[i]));; binFolder1.getChildFile(files[i]).copyFileTo(binFolder2.getChildFile(files[i]));;
#else #else
if (! binaryFileSource.createSymbolicLink(binaryFileTarget, true))
{
pData->engine->setLastError("Failed to create symbolik link of plugin binary");
return false;
}

File(opts.binaryDir).createSymbolicLink(File(binFolderTarget.buffer()), true); File(opts.binaryDir).createSymbolicLink(File(binFolderTarget.buffer()), true);
File(opts.resourceDir).createSymbolicLink(File(resFolderTarget.buffer()), true); File(opts.resourceDir).createSymbolicLink(File(resFolderTarget.buffer()), true);
#endif #endif


+ 0
- 3
source/bridges-plugin/CarlaBridgeSingleLV2.cpp View File

@@ -711,12 +711,9 @@ const LV2UI_Descriptor* lv2ui_descriptor(uint32_t index)
{ {
carla_debug("lv2ui_descriptor(%i)", index); carla_debug("lv2ui_descriptor(%i)", index);


static CarlaMutex retLock;
static CarlaString ret; static CarlaString ret;


{ {
const CarlaMutexLocker cml(retLock);

using namespace water; using namespace water;
const File file(File::getSpecialLocation(File::currentExecutableFile).getSiblingFile("ext-ui")); const File file(File::getSpecialLocation(File::currentExecutableFile).getSiblingFile("ext-ui"));
#ifdef CARLA_OS_WIN #ifdef CARLA_OS_WIN


Loading…
Cancel
Save