falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Browse Source

Cleanup CARLA_PLUGIN_ONLY_BRIDGE macro usage 

Signed-off-by: falkTX <falktx@falktx.com>
pull/1775/head
falkTX 2 years ago
parent
2cb5950eb0
commit
f1a30531b9
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 15 additions and 15 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -4
      source/backend/plugin/CarlaPlugin.cpp
  2. +9
    -9
      source/utils/CarlaStateUtils.cpp
  3. +2
    -2
      source/utils/CarlaStateUtils.hpp

+ 4
- 4
source/backend/plugin/CarlaPlugin.cpp View File

@@ -543,7 +543,7 @@ const CarlaStateSave& CarlaPlugin::getStateSave(const bool callPrepareForSave)
if (pData->filename != nullptr)
pData->stateSave.binary = carla_strdup(pData->filename);

#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
// ---------------------------------------------------------------
// Internals

@@ -621,7 +621,7 @@ const CarlaStateSave& CarlaPlugin::getStateSave(const bool callPrepareForSave)

stateParameter->dummy = dummy;
stateParameter->index = paramData.index;
#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (paramData.mappedControlIndex != CONTROL_INDEX_MIDI_LEARN)
{
stateParameter->mappedControlIndex = paramData.mappedControlIndex;
@@ -859,7 +859,7 @@ void CarlaPlugin::loadStateSave(const CarlaStateSave& stateSave)
setParameterValue(static_cast<uint32_t>(index), stateParameter->value, true, true, true);
}

#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (stateParameter->mappedRangeValid)
{
if (pData->param.data[index].hints & PARAMETER_USES_SAMPLERATE)
@@ -946,7 +946,7 @@ void CarlaPlugin::loadStateSave(const CarlaStateSave& stateSave)
#endif
}

#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
// ---------------------------------------------------------------
// Part 6 - set internal stuff



+ 9
- 9
source/utils/CarlaStateUtils.cpp View File

@@ -122,7 +122,7 @@ CarlaStateSave::Parameter::Parameter() noexcept
index(-1),
name(nullptr),
symbol(nullptr),
#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
value(0.0f),
mappedControlIndex(CONTROL_INDEX_NONE),
midiChannel(0),
@@ -193,7 +193,7 @@ CarlaStateSave::CarlaStateSave() noexcept
uniqueId(0),
options(PLUGIN_OPTIONS_NULL),
temporary(false),
#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
active(false),
dryWet(1.0f),
volume(1.0f),
@@ -251,7 +251,7 @@ void CarlaStateSave::clear() noexcept
uniqueId = 0;
options = PLUGIN_OPTIONS_NULL;

#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
active = false;
dryWet = 1.0f;
volume = 1.0f;
@@ -336,7 +336,7 @@ bool CarlaStateSave::fillFromXmlElement(const XmlElement* const xmlElement)
if (value > 0)
options = static_cast<uint>(value);
}
#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
else if (tag == "Active")
{
active = (text == "Yes");
@@ -408,7 +408,7 @@ bool CarlaStateSave::fillFromXmlElement(const XmlElement* const xmlElement)
else if (tag == "Parameter")
{
Parameter* const stateParameter(new Parameter());
#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
bool hasMappedMinimum = false, hasMappedMaximum = false;
#endif

@@ -436,7 +436,7 @@ bool CarlaStateSave::fillFromXmlElement(const XmlElement* const xmlElement)
stateParameter->dummy = false;
stateParameter->value = pText.getFloatValue();
}
#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
else if (pTag == "MidiChannel")
{
const int channel(pText.getIntValue());
@@ -469,7 +469,7 @@ bool CarlaStateSave::fillFromXmlElement(const XmlElement* const xmlElement)
#endif
}

#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (hasMappedMinimum && hasMappedMaximum)
stateParameter->mappedRangeValid = true;
#endif
@@ -625,7 +625,7 @@ void CarlaStateSave::dumpToMemoryStream(MemoryOutputStream& content) const

content << " <Data>\n";

#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
{
MemoryOutputStream dataXml;

@@ -673,7 +673,7 @@ void CarlaStateSave::dumpToMemoryStream(MemoryOutputStream& content) const
parameterXml << " <Symbol>" << xmlSafeString(stateParameter->symbol, true) << "</Symbol>\n";
}

#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (stateParameter->mappedControlIndex > CONTROL_INDEX_NONE && stateParameter->mappedControlIndex <= CONTROL_INDEX_MAX_ALLOWED)
{
parameterXml << " <MidiChannel>" << stateParameter->midiChannel+1 << "</MidiChannel>\n";


+ 2
- 2
source/utils/CarlaStateUtils.hpp View File

@@ -34,7 +34,7 @@ struct CarlaStateSave {
const char* name;
const char* symbol;
float value;
#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
int16_t mappedControlIndex;
uint8_t midiChannel;
bool mappedRangeValid;
@@ -76,7 +76,7 @@ struct CarlaStateSave {
// saved during clone, rename or similar
bool temporary;

#if !(defined(BUILD_BRIDGE_ALTERNATIVE_ARCH) || defined(CARLA_PLUGIN_ONLY_BRIDGE))
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
bool active;
float dryWet;
float volume;


Write Preview
Loading…
Cancel
Save