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

Clean up the reset* APIs

Browse source
This commit is contained in:
Paul Ferrand 2020-03-29 13:20:30 +02:00
parent 1215067dcf
commit fc05ca0af0
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sfizz/MidiState.cpp
View file

@ -10,7 +10,7 @@
sfz::MidiState::MidiState() sfz::MidiState::MidiState()
{ {
reset(0); reset();
} }
void sfz::MidiState::noteOnEvent(int delay, int noteNumber, float velocity) noexcept void sfz::MidiState::noteOnEvent(int delay, int noteNumber, float velocity) noexcept
@ -105,7 +105,7 @@ float sfz::MidiState::getCCValue(int ccNumber) const noexcept
return cc[ccNumber].back().second; return cc[ccNumber].back().second;
} }
void sfz::MidiState::reset(int delay) noexcept void sfz::MidiState::reset() noexcept
{ {
for (auto& velocity: lastNoteVelocities) for (auto& velocity: lastNoteVelocities)
velocity = 0; velocity = 0;
@ -124,10 +124,8 @@ void sfz::MidiState::reset(int delay) noexcept
void sfz::MidiState::resetAllControllers(int delay) noexcept void sfz::MidiState::resetAllControllers(int delay) noexcept
{ {
for (auto& ccEvents: cc) { for (unsigned ccIdx = 0; ccIdx < config::numCCs; ++ccIdx)
ccEvents.clear(); ccEvent(delay, ccIdx, 0.0f);
ccEvents.emplace_back(0, 0.0f);
}
pitchBend = 0; pitchBend = 0;
} }

2
src/sfizz/MidiState.h
View file

@ -113,7 +113,7 @@ public:
* @brief Reset the midi state (does not impact the last note on time) * @brief Reset the midi state (does not impact the last note on time)
* *
*/ */
void reset(int delay) noexcept; void reset() noexcept;
/** /**
* @brief Reset all the controllers * @brief Reset all the controllers

2
src/sfizz/Synth.cpp
View file

@ -151,7 +151,7 @@ void sfz::Synth::clear()
fileTicket = -1; fileTicket = -1;
defaultSwitch = absl::nullopt; defaultSwitch = absl::nullopt;
defaultPath = ""; defaultPath = "";
resources.midiState.reset(0); resources.midiState.reset();
ccNames.clear(); ccNames.clear();
globalOpcodes.clear(); globalOpcodes.clear();
masterOpcodes.clear(); masterOpcodes.clear();