Commit: 1d50303a069f8591a91a9bc822ffdaf54a9905bb - timidity41 (git)

Commit MetaInfo

• Revision: 1d50303a069f8591a91a9bc822ffdaf54a9905bb (tree)
• Time: 2019-09-05 17:09:23
• Author: Starg <starg@user...>
• Commiter: Starg

Log Message

[sfz] Add support for <master> header

Change Summary

• modified: timidity/sfz.cpp

Incremental Difference

--- a/timidity/sfz.cpp
+++ b/timidity/sfz.cpp
@@ -864,6 +864,7 @@ enum class HeaderKind
 {
     Control,
     Global,
+    Master,
     Group,
     Region
 };
@@ -1086,6 +1087,7 @@ private:
             {"control"sv, HeaderKind::Control},
             {"global"sv, HeaderKind::Global},
             {"group"sv, HeaderKind::Group},
+            {"master"sv, HeaderKind::Master},
             {"region"sv, HeaderKind::Region}
         };
 
@@ -1709,6 +1711,7 @@ private:
         std::vector<Section> flatSections;
         std::vector<OpCodeAndValue> controlOpCodes;
         std::vector<OpCodeAndValue> globalOpCodes;
+        std::vector<OpCodeAndValue> masterOpCodes;
         std::vector<OpCodeAndValue> groupOpCodes;
 
         for (auto&& i : sections)
@@ -1721,6 +1724,13 @@ private:
 
             case HeaderKind::Global:
                 globalOpCodes = i.OpCodes;
+                masterOpCodes.clear();
+                groupOpCodes.clear();
+                break;
+
+            case HeaderKind::Master:
+                masterOpCodes = i.OpCodes;
+                groupOpCodes.clear();
                 break;
 
             case HeaderKind::Group:
@@ -1733,9 +1743,10 @@ private:
                 newSection.HeaderLocation = i.HeaderLocation;
                 auto& opCodes = newSection.OpCodes;
                 opCodes.clear();
-                opCodes.reserve(controlOpCodes.size() + globalOpCodes.size() + groupOpCodes.size() + i.OpCodes.size());
+                opCodes.reserve(controlOpCodes.size() + globalOpCodes.size() + masterOpCodes.size() + groupOpCodes.size() + i.OpCodes.size());
                 opCodes.insert(opCodes.end(), controlOpCodes.begin(), controlOpCodes.end());
                 opCodes.insert(opCodes.end(), globalOpCodes.begin(), globalOpCodes.end());
+                opCodes.insert(opCodes.end(), masterOpCodes.begin(), masterOpCodes.end());
                 opCodes.insert(opCodes.end(), groupOpCodes.begin(), groupOpCodes.end());
                 opCodes.insert(opCodes.end(), i.OpCodes.begin(), i.OpCodes.end());
                 break;