sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename VST CC, not necessarily MIDI

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-02-08 20:14:07 +01:00
parent 77719d788e
commit e75c148c67
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/vst/SfizzVstController.cpp
View file

@ -80,14 +80,14 @@ tresult PLUGIN_API SfizzVstControllerNoUi::initialize(FUnknown* context)
Vst::ParamID id = Vst::kNoParamId; Vst::ParamID id = Vst::kNoParamId;
switch (i) { switch (i) {
case Vst::kAfterTouch: case Vst::kAfterTouch:
id = kPidMidiAftertouch; id = kPidAftertouch;
break; break;
case Vst::kPitchBend: case Vst::kPitchBend:
id = kPidMidiPitchBend; id = kPidPitchBend;
break; break;
default: default:
if (i < 128) if (i < 128)
id = kPidMidiCC0 + i; id = kPidCC0 + i;
break; break;
} }
midiMapping_[i] = id; midiMapping_[i] = id;

14
plugins/vst/SfizzVstParameters.h
View file

@ -20,10 +20,10 @@ enum {
kPidScalaRootKey, kPidScalaRootKey,
kPidTuningFrequency, kPidTuningFrequency,
kPidStretchedTuning, kPidStretchedTuning,
kPidMidiAftertouch, kPidAftertouch,
kPidMidiPitchBend, kPidPitchBend,
kPidMidiCC0, kPidCC0,
kPidMidiCCLast = kPidMidiCC0 + sfz::config::numCCs - 1, kPidCCLast = kPidCC0 + sfz::config::numCCs - 1,
/* Reserved */ /* Reserved */
}; };
@ -67,12 +67,12 @@ struct SfizzRange {
return {440.0, 300.0, 500.0}; return {440.0, 300.0, 500.0};
case kPidStretchedTuning: case kPidStretchedTuning:
return {0.0, 0.0, 1.0}; return {0.0, 0.0, 1.0};
case kPidMidiAftertouch: case kPidAftertouch:
return {0.0, 0.0, 1.0}; return {0.0, 0.0, 1.0};
case kPidMidiPitchBend: case kPidPitchBend:
return {0.5, 0.0, 1.0}; return {0.5, 0.0, 1.0};
default: default:
if (id >= kPidMidiCC0 && id <= kPidMidiCCLast) if (id >= kPidCC0 && id <= kPidCCLast)
return {0.0, 0.0, 1.0}; return {0.0, 0.0, 1.0};
throw std::runtime_error("Bad parameter ID"); throw std::runtime_error("Bad parameter ID");
} }

8
plugins/vst/SfizzVstProcessor.cpp
View file

@ -385,8 +385,8 @@ void SfizzVstProcessor::processControllerChanges(Vst::IParameterChanges& pc)
switch (id) { switch (id) {
default: default:
if (id >= kPidMidiCC0 && id <= kPidMidiCCLast) { if (id >= kPidCC0 && id <= kPidCCLast) {
auto ccNumber = static_cast<int>(id - kPidMidiCC0); auto ccNumber = static_cast<int>(id - kPidCC0);
for (uint32 pointIndex = 0; pointIndex < pointCount; ++pointIndex) { for (uint32 pointIndex = 0; pointIndex < pointCount; ++pointIndex) {
if (vq->getPoint(pointIndex, sampleOffset, value) == kResultTrue) if (vq->getPoint(pointIndex, sampleOffset, value) == kResultTrue)
synth.cc(sampleOffset, ccNumber, fastRound(value * 127.0)); synth.cc(sampleOffset, ccNumber, fastRound(value * 127.0));
@ -394,14 +394,14 @@ void SfizzVstProcessor::processControllerChanges(Vst::IParameterChanges& pc)
} }
break; break;
case kPidMidiAftertouch: case kPidAftertouch:
for (uint32 pointIndex = 0; pointIndex < pointCount; ++pointIndex) { for (uint32 pointIndex = 0; pointIndex < pointCount; ++pointIndex) {
if (vq->getPoint(pointIndex, sampleOffset, value) == kResultTrue) if (vq->getPoint(pointIndex, sampleOffset, value) == kResultTrue)
synth.aftertouch(sampleOffset, fastRound(value * 127.0)); synth.aftertouch(sampleOffset, fastRound(value * 127.0));
} }
break; break;
case kPidMidiPitchBend: case kPidPitchBend:
for (uint32 pointIndex = 0; pointIndex < pointCount; ++pointIndex) { for (uint32 pointIndex = 0; pointIndex < pointCount; ++pointIndex) {
if (vq->getPoint(pointIndex, sampleOffset, value) == kResultTrue) if (vq->getPoint(pointIndex, sampleOffset, value) == kResultTrue)
synth.pitchWheel(sampleOffset, fastRound(value * 16383) - 8192); synth.pitchWheel(sampleOffset, fastRound(value * 16383) - 8192);