From a0a6ab1d657020d42717a498a317bdcf303f4fa5 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sun, 15 Dec 2019 16:37:57 +0100 Subject: [PATCH] Removed the global and control unicity checks --- src/sfizz/Synth.cpp | 9 --------- src/sfizz/Synth.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp index 57a17e75..8d5d7295 100644 --- a/src/sfizz/Synth.cpp +++ b/src/sfizz/Synth.cpp @@ -63,17 +63,10 @@ void sfz::Synth::callback(absl::string_view header, const std::vector& m { switch (hash(header)) { case hash("global"): - // We shouldn't have multiple global headers in file - // But apparently some instruments do not really care :) - // ASSERT(!hasGlobal); globalOpcodes = members; handleGlobalOpcodes(members); - hasGlobal = true; break; case hash("control"): - // We shouldn't have multiple control headers in file - // ASSERT(!hasControl) - hasControl = true; handleControlOpcodes(members); break; case hash("master"): @@ -138,8 +131,6 @@ void sfz::Synth::clear() list.clear(); regions.clear(); resources.filePool.clear(); - hasGlobal = false; - hasControl = false; numGroups = 0; numMasters = 0; numCurves = 0; diff --git a/src/sfizz/Synth.h b/src/sfizz/Synth.h index 7db4a65c..f3840343 100644 --- a/src/sfizz/Synth.h +++ b/src/sfizz/Synth.h @@ -357,8 +357,6 @@ protected: void callback(absl::string_view header, const std::vector& members) final; private: - bool hasGlobal { false }; - bool hasControl { false }; int numGroups { 0 }; int numMasters { 0 }; int numCurves { 0 };