From c2360bad454fa91901aae0c7e2ec8f81b53cc8c2 Mon Sep 17 00:00:00 2001
From: Paul Fd <paul@ferrand.cc>
Date: Tue, 7 Apr 2020 16:24:38 +0200
Subject: [PATCH] Feed master opcodes to the handleGroupOpcodes

---
 src/sfizz/Synth.cpp                  | 14 ++++++++++----
 src/sfizz/Synth.h                    |  2 +-
 tests/SynthT.cpp                     | 22 ++++++++++++++++++++++
 tests/TestFiles/master_polyphony.sfz |  7 +++++++
 4 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 tests/TestFiles/master_polyphony.sfz

diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp
index 25393b4d..7f4df9d7 100644
--- a/src/sfizz/Synth.cpp
+++ b/src/sfizz/Synth.cpp
@@ -67,7 +67,7 @@ void sfz::Synth::onParseFullBlock(const std::string& header, const std::vector<O
         break;
     case hash("group"):
         groupOpcodes = members;
-        handleGroupOpcodes(members);
+        handleGroupOpcodes(members, masterOpcodes);
         numGroups++;
         break;
     case hash("region"):
@@ -177,12 +177,12 @@ void sfz::Synth::handleGlobalOpcodes(const std::vector<Opcode>& members)
     }
 }
 
-void sfz::Synth::handleGroupOpcodes(const std::vector<Opcode>& members)
+void sfz::Synth::handleGroupOpcodes(const std::vector<Opcode>& members, const std::vector<Opcode>& masterMembers)
 {
     absl::optional<unsigned> groupIdx;
     unsigned maxPolyphony { config::maxVoices };
 
-    for (auto& member : members) {
+    const auto parseOpcode = [&](const Opcode& member) {
         switch (member.lettersOnlyHash) {
         case hash("group"):
             setValueFromOpcode(member, groupIdx, Default::groupRange);
@@ -191,7 +191,13 @@ void sfz::Synth::handleGroupOpcodes(const std::vector<Opcode>& members)
             setValueFromOpcode(member, maxPolyphony, Range<unsigned>(0, config::maxVoices));
             break;
         }
-    }
+    };
+
+    for (auto& member : masterMembers)
+        parseOpcode(member);
+
+    for (auto& member : members)
+        parseOpcode(member);
 
     if (groupIdx)
         setGroupPolyphony(*groupIdx, maxPolyphony);
diff --git a/src/sfizz/Synth.h b/src/sfizz/Synth.h
index a9ce64ab..16017f3a 100644
--- a/src/sfizz/Synth.h
+++ b/src/sfizz/Synth.h
@@ -454,7 +454,7 @@ private:
      *
      * @param members the opcodes of the <group> block
      */
-    void handleGroupOpcodes(const std::vector<Opcode>& members);
+    void handleGroupOpcodes(const std::vector<Opcode>& members, const std::vector<Opcode>& masterMembers);
     /**
      * @brief Helper function to dispatch <control> opcodes
      *
diff --git a/tests/SynthT.cpp b/tests/SynthT.cpp
index 0434d9ce..bd0d28cc 100644
--- a/tests/SynthT.cpp
+++ b/tests/SynthT.cpp
@@ -397,3 +397,25 @@ TEST_CASE("[Synth] Not self-masking")
     REQUIRE(synth.getVoiceView(2)->getTriggerValue() == 64_norm);
     REQUIRE(!synth.getVoiceView(2)->canBeStolen());
 }
+
+TEST_CASE("[Synth] Polyphony in master")
+{
+    sfz::Synth synth;
+    synth.loadSfzFile(fs::current_path() / "tests/TestFiles/master_polyphony.sfz");
+    synth.noteOn(0, 65, 64);
+    synth.noteOn(0, 65, 64);
+    synth.noteOn(0, 65, 64);
+    REQUIRE(synth.getNumActiveVoices() == 2); // group polyphony should block the last note
+    synth.allSoundOff();
+    REQUIRE(synth.getNumActiveVoices() == 0);
+    synth.noteOn(0, 63, 64);
+    synth.noteOn(0, 63, 64);
+    synth.noteOn(0, 63, 64);
+    REQUIRE(synth.getNumActiveVoices() == 2); // group polyphony should block the last note
+    synth.allSoundOff();
+    REQUIRE(synth.getNumActiveVoices() == 0);
+    synth.noteOn(0, 61, 64);
+    synth.noteOn(0, 61, 64);
+    synth.noteOn(0, 61, 64);
+    REQUIRE(synth.getNumActiveVoices() == 3);
+}
diff --git a/tests/TestFiles/master_polyphony.sfz b/tests/TestFiles/master_polyphony.sfz
new file mode 100644
index 00000000..88d7bd7a
--- /dev/null
+++ b/tests/TestFiles/master_polyphony.sfz
@@ -0,0 +1,7 @@
+<master> polyphony=2
+<group> group=2
+<region> sample=*sine key=65
+<group> group=3
+<region> sample=*sine key=63
+<master> // Empty master resets the polyphony
+<region> sample=*sine key=61