brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2022-02-27 15:19:09 +00:00
parent 49842e83e5
commit ad36594b35
1 changed files with 29 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

60
plugins/Cardinal/src/HostMIDI-CC.cpp
View file

@ -68,7 +68,7 @@ struct HostMIDICC : TerminalModule {
uint8_t chPressure[16]; uint8_t chPressure[16];
uint16_t pitchbend[16]; uint16_t pitchbend[16];
// stuff from Rack // adapted from Rack
/** [cc][channel] */ /** [cc][channel] */
uint8_t ccValues[128][16]; uint8_t ccValues[128][16];
/** When LSB is enabled for CC 0-31, the MSB is stored here until the LSB is received. /** When LSB is enabled for CC 0-31, the MSB is stored here until the LSB is received.
@ -85,10 +85,11 @@ struct HostMIDICC : TerminalModule {
MidiInput(CardinalPluginContext* const pc) MidiInput(CardinalPluginContext* const pc)
: pcontext(pc) : pcontext(pc)
{ {
for (int i = 0; i < NUM_OUTPUTS; i++) { // adapted from Rack
for (int c = 0; c < 16; c++) { for (int id = 0; id < NUM_OUTPUTS; ++id)
valueFilters[i][c].setTau(1 / 30.f); {
} for (int c = 0; c < 16; ++c)
valueFilters[id][c].setTau(1 / 30.f);
} }
reset(); reset();
} }
@ -101,20 +102,14 @@ struct HostMIDICC : TerminalModule {
lastBlockFrame = -1; lastBlockFrame = -1;
channel = 0; channel = 0;
for (uint8_t cc = 0; cc < 128; cc++) { // adapted from Rack
for (int c = 0; c < 16; c++) { std::memset(ccValues, 0, sizeof(ccValues));
ccValues[cc][c] = 0; std::memset(msbValues, 0, sizeof(msbValues));
} std::memset(chPressure, 0, sizeof(chPressure));
}
for (uint8_t cc = 0; cc < 32; cc++) { for (int c = 0; c < 16; ++c)
for (int c = 0; c < 16; c++) {
msbValues[cc][c] = 0;
}
}
for (int c = 0; c < 16; c++) {
chPressure[c] = 0;
pitchbend[c] = 8192; pitchbend[c] = 8192;
}
learningId = -1; learningId = -1;
smooth = true; smooth = true;
mpeMode = false; mpeMode = false;
@ -181,7 +176,7 @@ struct HostMIDICC : TerminalModule {
continue; continue;
} }
// adapted from Rack // adapted from Rack `processCC`
const uint8_t c = mpeMode ? chan : 0; const uint8_t c = mpeMode ? chan : 0;
const int8_t cc = data[1]; const int8_t cc = data[1];
const uint8_t value = data[2]; const uint8_t value = data[2];
@ -207,7 +202,7 @@ struct HostMIDICC : TerminalModule {
// Don't set MSB yet. Wait for LSB to be received. // Don't set MSB yet. Wait for LSB to be received.
msbValues[cc][c] = value; msbValues[cc][c] = value;
} }
else if (lsbMode && 32 <= cc && cc < 64) else if (lsbMode && cc >= 32 && cc < 64)
{ {
// Apply MSB when LSB is received // Apply MSB when LSB is received
ccValues[cc - 32][c] = msbValues[cc - 32][c]; ccValues[cc - 32][c] = msbValues[cc - 32][c];
@ -224,18 +219,21 @@ struct HostMIDICC : TerminalModule {
// Rack stuff // Rack stuff
const int channels = mpeMode ? 16 : 1; const int channels = mpeMode ? 16 : 1;
for (int i = 0; i < 16; i++) for (int id = 0; id < 16; ++id)
{ {
if (!outputs[CC_OUTPUT + i].isConnected()) if (!outputs[CC_OUTPUT + id].isConnected())
continue; continue;
outputs[CC_OUTPUT + i].setChannels(channels); outputs[CC_OUTPUT + id].setChannels(channels);
const int8_t cc = learnedCcs[i]; const int8_t cc = learnedCcs[id];
if (cc < 0) if (cc < 0)
{
outputs[CC_OUTPUT + id].clearVoltages();
continue; continue;
}
for (int c = 0; c < channels; c++) for (int c = 0; c < channels; ++c)
{ {
int16_t cellValue = int16_t(ccValues[cc][c]) * 128; int16_t cellValue = int16_t(ccValues[cc][c]) * 128;
if (lsbMode && cc < 32) if (lsbMode && cc < 32)
@ -245,18 +243,18 @@ struct HostMIDICC : TerminalModule {
const float value = static_cast<float>(cellValue) / (128.0f * 127.0f); const float value = static_cast<float>(cellValue) / (128.0f * 127.0f);
// Detect behavior from MIDI buttons. // Detect behavior from MIDI buttons.
if (smooth && std::fabs(valueFilters[i][c].out - value) < 1.f) if (smooth && std::fabs(valueFilters[id][c].out - value) < 1.f)
{ {
// Smooth value with filter // Smooth value with filter
valueFilters[i][c].process(args.sampleTime, value); valueFilters[id][c].process(args.sampleTime, value);
} }
else else
{ {
// Jump value // Jump value
valueFilters[i][c].out = value; valueFilters[id][c].out = value;
} }
outputs[CC_OUTPUT + i].setVoltage(valueFilters[i][c].out * 10.f, c); outputs[CC_OUTPUT + id].setVoltage(valueFilters[id][c].out * 10.f, c);
} }
} }
@ -264,7 +262,7 @@ struct HostMIDICC : TerminalModule {
{ {
outputs[CC_OUTPUT_CH_PRESSURE].setChannels(channels); outputs[CC_OUTPUT_CH_PRESSURE].setChannels(channels);
for (int c = 0; c < channels; c++) for (int c = 0; c < channels; ++c)
{ {
const float value = static_cast<float>(chPressure[c]) / 128.0f; const float value = static_cast<float>(chPressure[c]) / 128.0f;
@ -288,7 +286,7 @@ struct HostMIDICC : TerminalModule {
{ {
outputs[CC_OUTPUT_PITCHBEND].setChannels(channels); outputs[CC_OUTPUT_PITCHBEND].setChannels(channels);
for (int c = 0; c < channels; c++) for (int c = 0; c < channels; ++c)
{ {
const float value = static_cast<float>(pitchbend[c]) / 16384.0f; const float value = static_cast<float>(pitchbend[c]) / 16384.0f;