From fc05ca0af0bb2745410a9e9f9fefa86707e62723 Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Sun, 29 Mar 2020 13:20:30 +0200
Subject: [PATCH] Clean up the reset* APIs

---
 src/sfizz/MidiState.cpp | 10 ++++------
 src/sfizz/MidiState.h   |  2 +-
 src/sfizz/Synth.cpp     |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/sfizz/MidiState.cpp b/src/sfizz/MidiState.cpp
index 0e207841..b1536251 100644
--- a/src/sfizz/MidiState.cpp
+++ b/src/sfizz/MidiState.cpp
@@ -10,7 +10,7 @@
 
 sfz::MidiState::MidiState()
 {
-    reset(0);
+    reset();
 }
 
 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;
 }
 
-void sfz::MidiState::reset(int delay) noexcept
+void sfz::MidiState::reset() noexcept
 {
     for (auto& velocity: lastNoteVelocities)
         velocity = 0;
@@ -124,10 +124,8 @@ void sfz::MidiState::reset(int delay) noexcept
 
 void sfz::MidiState::resetAllControllers(int delay) noexcept
 {
-    for (auto& ccEvents: cc) {
-        ccEvents.clear();
-        ccEvents.emplace_back(0, 0.0f);
-    }
+    for (unsigned ccIdx = 0; ccIdx < config::numCCs; ++ccIdx)
+        ccEvent(delay, ccIdx, 0.0f);
 
     pitchBend = 0;
 }
diff --git a/src/sfizz/MidiState.h b/src/sfizz/MidiState.h
index 1b73dc42..103ed9cd 100644
--- a/src/sfizz/MidiState.h
+++ b/src/sfizz/MidiState.h
@@ -113,7 +113,7 @@ public:
      * @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
diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp
index 01cf351b..d9b0bb88 100644
--- a/src/sfizz/Synth.cpp
+++ b/src/sfizz/Synth.cpp
@@ -151,7 +151,7 @@ void sfz::Synth::clear()
     fileTicket = -1;
     defaultSwitch = absl::nullopt;
     defaultPath = "";
-    resources.midiState.reset(0);
+    resources.midiState.reset();
     ccNames.clear();
     globalOpcodes.clear();
     masterOpcodes.clear();