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

Parse hint_sustain_cancels_release

Browse source
This commit is contained in:
Paul Fd 2021-05-23 15:23:12 +02:00
parent 8721c34e14
commit 1153c15211
5 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/sfizz/Defaults.cpp
View file

@ -187,6 +187,7 @@ FloatSpec lofiBitred { 0.0f, {0.0f, 100.0f}, 0 };
FloatSpec lofiDecim { 0.0f, {0.0f, 100.0f}, 0 }; FloatSpec lofiDecim { 0.0f, {0.0f, 100.0f}, 0 };
FloatSpec rectify { 0.0f, {0.0f, 100.0f}, 0 }; FloatSpec rectify { 0.0f, {0.0f, 100.0f}, 0 };
UInt32Spec stringsNumber { maxStrings, {0, maxStrings}, 0 }; UInt32Spec stringsNumber { maxStrings, {0, maxStrings}, 0 };
BoolSpec sustainCancelsRelease { false, {0, 1}, kEnforceBounds };
ESpec<Trigger> trigger { Trigger::attack, {Trigger::attack, Trigger::release_key}, 0}; ESpec<Trigger> trigger { Trigger::attack, {Trigger::attack, Trigger::release_key}, 0};
ESpec<CrossfadeCurve> crossfadeCurve { CrossfadeCurve::power, {CrossfadeCurve::gain, CrossfadeCurve::power}, 0}; ESpec<CrossfadeCurve> crossfadeCurve { CrossfadeCurve::power, {CrossfadeCurve::gain, CrossfadeCurve::power}, 0};

1
src/sfizz/Defaults.h
View file

@ -305,6 +305,7 @@ namespace Default
extern const OpcodeSpec<SelfMask> selfMask; extern const OpcodeSpec<SelfMask> selfMask;
extern const OpcodeSpec<FilterType> filter; extern const OpcodeSpec<FilterType> filter;
extern const OpcodeSpec<EqType> eq; extern const OpcodeSpec<EqType> eq;
extern const OpcodeSpec<bool> sustainCancelsRelease;
// Default/max count for objects // Default/max count for objects
constexpr int numEQs { 3 }; constexpr int numEQs { 3 };

6
src/sfizz/Synth.cpp
View file

@ -437,6 +437,12 @@ void Synth::Impl::handleControlOpcodes(const std::vector<Opcode>& members)
DBG("Unsupported value for hint_stealing: " << member.value); DBG("Unsupported value for hint_stealing: " << member.value);
} }
break; break;
case hash("hint_sustain_cancels_release"):
{
SynthConfig& config = resources_.getSynthConfig();
config.sustainCancelsRelease = member.read(Default::sustainCancelsRelease);
}
break;
default: default:
// Unsupported control opcode // Unsupported control opcode
DBG("Unsupported control opcode: " << member.name); DBG("Unsupported control opcode: " << member.name);

2
src/sfizz/SynthConfig.h
View file

@ -28,5 +28,7 @@ struct SynthConfig
{ {
return freeWheeling ? freeWheelingOscillatorQuality : liveOscillatorQuality; return freeWheeling ? freeWheelingOscillatorQuality : liveOscillatorQuality;
} }
bool sustainCancelsRelease { Default::sustainCancelsRelease };
}; };
} }

1
src/sfizz/Voice.cpp
View file

@ -678,6 +678,7 @@ void Voice::registerCC(int delay, int ccNumber, float ccValue) noexcept
release(delay); release(delay);
if (region.checkSustain && (impl.sustainState_ == Impl::SustainState::Sustaining) if (region.checkSustain && (impl.sustainState_ == Impl::SustainState::Sustaining)
&& impl.resources_.getSynthConfig().sustainCancelsRelease
&& impl.released() && (region.trigger != Trigger::release && region.trigger != Trigger::release_key) ) { && impl.released() && (region.trigger != Trigger::release && region.trigger != Trigger::release_key) ) {
ModMatrix& modMatrix = impl.resources_.getModMatrix(); ModMatrix& modMatrix = impl.resources_.getModMatrix();
modMatrix.cancelRelease(impl.id_, impl.region_->getId(), delay); modMatrix.cancelRelease(impl.id_, impl.region_->getId(), delay);