From f9cf9b35e6e8367dd3174d727eae1aaf8bccd10d Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Fri, 11 Sep 2020 12:27:39 +0200
Subject: [PATCH] Move NumericId into utility

---
 src/sfizz/Region.h                   | 2 +-
 src/sfizz/Voice.h                    | 2 +-
 src/sfizz/modulations/ModGenerator.h | 2 +-
 src/sfizz/modulations/ModKey.h       | 2 +-
 src/sfizz/modulations/ModMatrix.h    | 2 +-
 src/sfizz/{ => utility}/NumericId.h  | 0
 tests/SynthT.cpp                     | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename src/sfizz/{ => utility}/NumericId.h (100%)

diff --git a/src/sfizz/Region.h b/src/sfizz/Region.h
index e5fbb6c0..4635f78c 100644
--- a/src/sfizz/Region.h
+++ b/src/sfizz/Region.h
@@ -17,7 +17,7 @@
 #include "AudioBuffer.h"
 #include "MidiState.h"
 #include "FileId.h"
-#include "NumericId.h"
+#include "utility/NumericId.h"
 #include "modulations/ModKey.h"
 #include "absl/types/optional.h"
 #include "absl/strings/string_view.h"
diff --git a/src/sfizz/Voice.h b/src/sfizz/Voice.h
index a010aaa8..c8ebb0c8 100644
--- a/src/sfizz/Voice.h
+++ b/src/sfizz/Voice.h
@@ -17,7 +17,7 @@
 #include "LeakDetector.h"
 #include "OnePoleFilter.h"
 #include "PowerFollower.h"
-#include "NumericId.h"
+#include "utility/NumericId.h"
 #include "absl/types/span.h"
 #include <memory>
 #include <random>
diff --git a/src/sfizz/modulations/ModGenerator.h b/src/sfizz/modulations/ModGenerator.h
index 3d7aed12..7bb6c329 100644
--- a/src/sfizz/modulations/ModGenerator.h
+++ b/src/sfizz/modulations/ModGenerator.h
@@ -5,7 +5,7 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #pragma once
-#include "../NumericId.h"
+#include "utility/NumericId.h"
 #include <absl/types/span.h>
 #include <cstdint>
 
diff --git a/src/sfizz/modulations/ModKey.h b/src/sfizz/modulations/ModKey.h
index 5fff0197..aec4f5ea 100644
--- a/src/sfizz/modulations/ModKey.h
+++ b/src/sfizz/modulations/ModKey.h
@@ -7,7 +7,7 @@
 #pragma once
 #include "ModKeyHash.h"
 #include "ModId.h"
-#include "../NumericId.h"
+#include "../utility/NumericId.h"
 #include <string>
 #include <cstring>
 
diff --git a/src/sfizz/modulations/ModMatrix.h b/src/sfizz/modulations/ModMatrix.h
index 211cf06f..b0f9f58f 100644
--- a/src/sfizz/modulations/ModMatrix.h
+++ b/src/sfizz/modulations/ModMatrix.h
@@ -5,7 +5,7 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #pragma once
-#include "../NumericId.h"
+#include "../utility/NumericId.h"
 #include <string>
 #include <memory>
 #include <cstdint>
diff --git a/src/sfizz/NumericId.h b/src/sfizz/utility/NumericId.h
similarity index 100%
rename from src/sfizz/NumericId.h
rename to src/sfizz/utility/NumericId.h
diff --git a/tests/SynthT.cpp b/tests/SynthT.cpp
index 8af5f4be..2144426a 100644
--- a/tests/SynthT.cpp
+++ b/tests/SynthT.cpp
@@ -7,7 +7,7 @@
 #include "sfizz/Synth.h"
 #include "sfizz/SisterVoiceRing.h"
 #include "sfizz/SfzHelpers.h"
-#include "sfizz/NumericId.h"
+#include "sfizz/utility/NumericId.h"
 #include "TestHelpers.h"
 #include <algorithm>
 #include "catch2/catch.hpp"