Browse Source

Fix regression, missing notes on new plugins

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.2.0-RC1
falkTX 4 years ago
parent
commit
6dbe64bc1f
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
10 changed files with 19 additions and 9 deletions
  1. +1
    -1
      source/backend/plugin/CarlaPluginBridge.cpp
  2. +1
    -1
      source/backend/plugin/CarlaPluginFluidSynth.cpp
  3. +1
    -1
      source/backend/plugin/CarlaPluginJack.cpp
  4. +1
    -1
      source/backend/plugin/CarlaPluginJuce.cpp
  5. +1
    -1
      source/backend/plugin/CarlaPluginLADSPADSSI.cpp
  6. +1
    -1
      source/backend/plugin/CarlaPluginLV2.cpp
  7. +1
    -1
      source/backend/plugin/CarlaPluginNative.cpp
  8. +1
    -1
      source/backend/plugin/CarlaPluginSFZero.cpp
  9. +1
    -1
      source/backend/plugin/CarlaPluginVST2.cpp
  10. +10
    -0
      source/utils/CarlaBackendUtils.hpp

+ 1
- 1
source/backend/plugin/CarlaPluginBridge.cpp View File

@@ -2701,7 +2701,7 @@ public:
pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF; pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF;


if (fInfo.optionsAvailable & PLUGIN_OPTION_SKIP_SENDING_NOTES) if (fInfo.optionsAvailable & PLUGIN_OPTION_SKIP_SENDING_NOTES)
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
if (isPluginOptionInverseEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES; pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES;


if (fInfo.optionsAvailable & PLUGIN_OPTION_SEND_PROGRAM_CHANGES) if (fInfo.optionsAvailable & PLUGIN_OPTION_SEND_PROGRAM_CHANGES)


+ 1
- 1
source/backend/plugin/CarlaPluginFluidSynth.cpp View File

@@ -1754,7 +1754,7 @@ public:
pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF; pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_MAP_PROGRAM_CHANGES)) if (isPluginOptionEnabled(options, PLUGIN_OPTION_MAP_PROGRAM_CHANGES))
pData->options |= PLUGIN_OPTION_MAP_PROGRAM_CHANGES; pData->options |= PLUGIN_OPTION_MAP_PROGRAM_CHANGES;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
if (isPluginOptionInverseEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES; pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES;


return true; return true;


+ 1
- 1
source/backend/plugin/CarlaPluginJack.cpp View File

@@ -1788,7 +1788,7 @@ public:
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_PROGRAM_CHANGES)) if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_PROGRAM_CHANGES))
pData->options |= PLUGIN_OPTION_SEND_PROGRAM_CHANGES; pData->options |= PLUGIN_OPTION_SEND_PROGRAM_CHANGES;


if (isPluginOptionEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
if (isPluginOptionInverseEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES; pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES;


return true; return true;


+ 1
- 1
source/backend/plugin/CarlaPluginJuce.cpp View File

@@ -1466,7 +1466,7 @@ public:
pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF; pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_PROGRAM_CHANGES)) if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_PROGRAM_CHANGES))
pData->options |= PLUGIN_OPTION_SEND_PROGRAM_CHANGES; pData->options |= PLUGIN_OPTION_SEND_PROGRAM_CHANGES;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
if (isPluginOptionInverseEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES; pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES;
} }




+ 1
- 1
source/backend/plugin/CarlaPluginLADSPADSSI.cpp View File

@@ -3042,7 +3042,7 @@ public:
pData->options |= PLUGIN_OPTION_SEND_PITCHBEND; pData->options |= PLUGIN_OPTION_SEND_PITCHBEND;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_ALL_SOUND_OFF)) if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_ALL_SOUND_OFF))
pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF; pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
if (isPluginOptionInverseEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES; pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES;
} }
} }


+ 1
- 1
source/backend/plugin/CarlaPluginLV2.cpp View File

@@ -6405,7 +6405,7 @@ public:
pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF; pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_PROGRAM_CHANGES)) if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_PROGRAM_CHANGES))
pData->options |= PLUGIN_OPTION_SEND_PROGRAM_CHANGES; pData->options |= PLUGIN_OPTION_SEND_PROGRAM_CHANGES;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
if (isPluginOptionInverseEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES; pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES;
} }




+ 1
- 1
source/backend/plugin/CarlaPluginNative.cpp View File

@@ -3022,7 +3022,7 @@ public:
pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF; pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF;


if (fDescriptor->midiIns > 0) if (fDescriptor->midiIns > 0)
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
if (isPluginOptionInverseEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES; pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES;


if (fDescriptor->supports & NATIVE_PLUGIN_SUPPORTS_PROGRAM_CHANGES) if (fDescriptor->supports & NATIVE_PLUGIN_SUPPORTS_PROGRAM_CHANGES)


+ 1
- 1
source/backend/plugin/CarlaPluginSFZero.cpp View File

@@ -756,7 +756,7 @@ public:
pData->options |= PLUGIN_OPTION_SEND_PITCHBEND; pData->options |= PLUGIN_OPTION_SEND_PITCHBEND;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_ALL_SOUND_OFF)) if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_ALL_SOUND_OFF))
pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF; pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
if (isPluginOptionInverseEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES; pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES;


return true; return true;


+ 1
- 1
source/backend/plugin/CarlaPluginVST2.cpp View File

@@ -2644,7 +2644,7 @@ public:
pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF; pData->options |= PLUGIN_OPTION_SEND_ALL_SOUND_OFF;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_PROGRAM_CHANGES)) if (isPluginOptionEnabled(options, PLUGIN_OPTION_SEND_PROGRAM_CHANGES))
pData->options |= PLUGIN_OPTION_SEND_PROGRAM_CHANGES; pData->options |= PLUGIN_OPTION_SEND_PROGRAM_CHANGES;
if (isPluginOptionEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
if (isPluginOptionInverseEnabled(options, PLUGIN_OPTION_SKIP_SENDING_NOTES))
pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES; pData->options |= PLUGIN_OPTION_SKIP_SENDING_NOTES;
} }




+ 10
- 0
source/utils/CarlaBackendUtils.hpp View File

@@ -744,6 +744,16 @@ bool isPluginOptionEnabled(const uint options, const uint option)
return false; return false;
} }


static inline
bool isPluginOptionInverseEnabled(const uint options, const uint option)
{
if (options == PLUGIN_OPTIONS_NULL)
return false;
if (options & option)
return true;
return false;
}

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


CARLA_BACKEND_END_NAMESPACE CARLA_BACKEND_END_NAMESPACE


Loading…
Cancel
Save