Removed the global and control unicity checks
This commit is contained in:
parent
1eaa2a5c5f
commit
a0a6ab1d65
2 changed files with 0 additions and 11 deletions
|
|
@ -63,17 +63,10 @@ void sfz::Synth::callback(absl::string_view header, const std::vector<Opcode>& m
|
||||||
{
|
{
|
||||||
switch (hash(header)) {
|
switch (hash(header)) {
|
||||||
case hash("global"):
|
case hash("global"):
|
||||||
// We shouldn't have multiple global headers in file
|
|
||||||
// But apparently some instruments do not really care :)
|
|
||||||
// ASSERT(!hasGlobal);
|
|
||||||
globalOpcodes = members;
|
globalOpcodes = members;
|
||||||
handleGlobalOpcodes(members);
|
handleGlobalOpcodes(members);
|
||||||
hasGlobal = true;
|
|
||||||
break;
|
break;
|
||||||
case hash("control"):
|
case hash("control"):
|
||||||
// We shouldn't have multiple control headers in file
|
|
||||||
// ASSERT(!hasControl)
|
|
||||||
hasControl = true;
|
|
||||||
handleControlOpcodes(members);
|
handleControlOpcodes(members);
|
||||||
break;
|
break;
|
||||||
case hash("master"):
|
case hash("master"):
|
||||||
|
|
@ -138,8 +131,6 @@ void sfz::Synth::clear()
|
||||||
list.clear();
|
list.clear();
|
||||||
regions.clear();
|
regions.clear();
|
||||||
resources.filePool.clear();
|
resources.filePool.clear();
|
||||||
hasGlobal = false;
|
|
||||||
hasControl = false;
|
|
||||||
numGroups = 0;
|
numGroups = 0;
|
||||||
numMasters = 0;
|
numMasters = 0;
|
||||||
numCurves = 0;
|
numCurves = 0;
|
||||||
|
|
|
||||||
|
|
@ -357,8 +357,6 @@ protected:
|
||||||
void callback(absl::string_view header, const std::vector<Opcode>& members) final;
|
void callback(absl::string_view header, const std::vector<Opcode>& members) final;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool hasGlobal { false };
|
|
||||||
bool hasControl { false };
|
|
||||||
int numGroups { 0 };
|
int numGroups { 0 };
|
||||||
int numMasters { 0 };
|
int numMasters { 0 };
|
||||||
int numCurves { 0 };
|
int numCurves { 0 };
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue