Browse Source

Fix last commit

tags/1.9.4
falkTX 12 years ago
parent
commit
77c581fff5
5 changed files with 21 additions and 3 deletions
  1. +2
    -1
      source/backend/plugin/CarlaPluginInternal.hpp
  2. +4
    -0
      source/backend/plugin/DssiPlugin.cpp
  3. +13
    -0
      source/backend/plugin/LadspaPlugin.cpp
  4. +1
    -1
      source/backend/plugin/Makefile
  5. +1
    -1
      source/utils/CarlaUtils.hpp

+ 2
- 1
source/backend/plugin/CarlaPluginInternal.hpp View File

@@ -590,7 +590,8 @@ struct CarlaPluginProtectedData {
masterMutex.unlock();
singleMutex.unlock();

libClose();
if (lib != nullptr)
libClose();
}

// -------------------------------------------------------------------


+ 4
- 0
source/backend/plugin/DssiPlugin.cpp View File

@@ -1927,6 +1927,10 @@ public:
kData->idStr += "/";
kData->idStr += label;
fOptions = kData->loadSettings(fOptions, availableOptions());

// ignore settings, we need this anyway
if (isDssiVst)
fOptions |= PLUGIN_OPTION_FIXED_BUFFER;
}

return true;


+ 13
- 0
source/backend/plugin/LadspaPlugin.cpp View File

@@ -1443,9 +1443,18 @@ public:
// load plugin settings

{
#ifdef __USE_GNU
const bool isDssiVst = fFilename.contains("dssi-vst", true);
#else
const bool isDssiVst = fFilename.contains("dssi-vst");
#endif

// set default options
fOptions = 0x0;

if (isDssiVst)
fOptions |= PLUGIN_OPTION_FIXED_BUFFER;

if (kData->engine->getOptions().forceStereo)
fOptions |= PLUGIN_OPTION_FORCE_STEREO;

@@ -1457,6 +1466,10 @@ public:
kData->idStr += "/";
kData->idStr += label;
fOptions = kData->loadSettings(fOptions, availableOptions());

// ignore settings, we need this anyway
if (isDssiVst)
fOptions |= PLUGIN_OPTION_FIXED_BUFFER;
}

return true;


+ 1
- 1
source/backend/plugin/Makefile View File

@@ -54,7 +54,7 @@ debug:

# --------------------------------------------------------------

%.cpp.o: %.cpp moc_CarlaPlugin.cpp ../CarlaBackend.hpp ../CarlaEngine.hpp ../CarlaPlugin.hpp CarlaPluginGui.hpp CarlaPluginInternal.hpp CarlaPluginThread.hpp
%.cpp.o: %.cpp moc_CarlaPluginGui.cpp ../CarlaBackend.hpp ../CarlaEngine.hpp ../CarlaPlugin.hpp CarlaPluginGui.hpp CarlaPluginInternal.hpp CarlaPluginThread.hpp
$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@

moc_%.cpp: %.hpp


+ 1
- 1
source/utils/CarlaUtils.hpp View File

@@ -359,7 +359,7 @@ static inline
void carla_zeroStruct(T* const structure, const size_t count)
{
CARLA_ASSERT(structure != nullptr);
CARLA_ASSERT(count > 1);
CARLA_ASSERT(count >= 1);

std::memset(structure, 0, sizeof(T)*count);
}


Loading…
Cancel
Save