Browse Source

Fix bridge build with previous commit

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

+ 2
- 0
source/backend/CarlaPlugin.hpp View File

@@ -892,11 +892,13 @@ public:
*/
CarlaEngineEventPort* getDefaultEventOutPort() const noexcept;

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
/*!
* Check if the plugin is interested on MIDI learn, and if so, map this event to the parameter that wants it.
* Event MUST be of control type and not have been handled before.
*/
void checkForMidiLearn(EngineEvent& event) noexcept;
#endif

/*!
* Get the plugin's type native handle.


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

@@ -2269,6 +2269,7 @@ void CarlaPlugin::idle()
CARLA_SAFE_ASSERT_BREAK(event.value1 >= 0 && event.value1 < MAX_MIDI_CHANNELS);
CARLA_SAFE_ASSERT_BREAK(event.value2 >= 0 && event.value2 < MAX_MIDI_NOTE);

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (event.sendCallback)
{
const int32_t parameterId = event.value1;
@@ -2290,6 +2291,7 @@ void CarlaPlugin::idle()
0, 0.0f, nullptr);

}
#endif
} break;
}
}
@@ -2572,6 +2574,7 @@ CarlaEngineEventPort* CarlaPlugin::getDefaultEventOutPort() const noexcept
return pData->event.portOut;
}

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
void CarlaPlugin::checkForMidiLearn(EngineEvent& event) noexcept
{
if (pData->midiLearnParameterIndex < 0)
@@ -2596,6 +2599,7 @@ void CarlaPlugin::checkForMidiLearn(EngineEvent& event) noexcept
pData->midiLearnParameterIndex, event.ctrl.param, event.channel, 0.0f);
pData->midiLearnParameterIndex = -1;
}
#endif

void* CarlaPlugin::getNativeHandle() const noexcept
{


+ 0
- 11
source/backend/plugin/CarlaPluginBridge.cpp View File

@@ -1365,17 +1365,6 @@ public:

case kEngineControlEventTypeParameter:
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
// non-midi
if (event.channel == kEngineEventNonMidiChannel)
{
const uint32_t k = ctrlEvent.param;
CARLA_SAFE_ASSERT_CONTINUE(k < pData->param.count);

// value = pData->param.getFinalUnnormalizedValue(k, ctrlEvent.value);
// setParameterValueRT(k, value, true);
continue;
}

// Control backend stuff
if (event.channel == pData->ctrlChannel)
{


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

@@ -968,9 +968,10 @@ public:
fMidiBuffer.addEvent(midiData, 3, static_cast<int>(event.time));
}

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (! ctrlEvent.handled)
checkForMidiLearn(event);
#endif
break;
} // case kEngineControlEventTypeParameter



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

@@ -1734,9 +1734,10 @@ public:
seqEvent.data.control.value = int8_t(ctrlEvent.value*127.0f);
}

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (! ctrlEvent.handled)
checkForMidiLearn(event);
#endif
break;
} // case kEngineControlEventTypeParameter



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

@@ -3923,9 +3923,10 @@ public:
lv2midi_put_event(&evInMidiStates[fEventsIn.ctrlIndex], mtime, 3, midiData);
}

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (! ctrlEvent.handled)
checkForMidiLearn(event);
#endif
break;
} // case kEngineControlEventTypeParameter



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

@@ -2058,9 +2058,10 @@ public:
nativeEvent.size = 3;
}

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (! ctrlEvent.handled)
checkForMidiLearn(event);
#endif
break;
} // case kEngineControlEventTypeParameter



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

@@ -1436,9 +1436,10 @@ public:
vstMidiEvent.midiData[2] = char(ctrlEvent.value*127.0f);
}

#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (! ctrlEvent.handled)
checkForMidiLearn(event);
#endif
break;
} // case kEngineControlEventTypeParameter



Loading…
Cancel
Save