From faadb70b022dc46b884bd1e0e004994e8fd70d7d Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sun, 1 Nov 2020 09:00:22 +0100 Subject: [PATCH] Include cleanups --- src/sfizz/Synth.cpp | 11 ++++++----- src/sfizz/Synth.h | 12 ++++++++---- src/sfizz/Voice.cpp | 7 +++---- src/sfizz/VoiceManager.h | 6 +++--- src/sfizz/parser/Parser.h | 8 ++++---- tests/FilesT.cpp | 1 + tests/LFOT.cpp | 1 + tests/PlotLFO.cpp | 1 + tests/TestHelpers.h | 1 + 9 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp index 2515d1de..9f2bb846 100644 --- a/src/sfizz/Synth.cpp +++ b/src/sfizz/Synth.cpp @@ -4,14 +4,11 @@ // license. You should have receive a LICENSE.md file along with the code. // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz -#include "absl/algorithm/container.h" -#include "absl/memory/memory.h" -#include "absl/strings/str_replace.h" +#include "Synth.h" #include "Config.h" #include "Debug.h" #include "Effects.h" #include "Macros.h" -#include "ModifierHelpers.h" #include "modulations/ModId.h" #include "modulations/ModKey.h" #include "modulations/ModMatrix.h" @@ -21,16 +18,20 @@ #include "modulations/sources/LFO.h" #include "PolyphonyGroup.h" #include "pugixml.hpp" +#include "Region.h" #include "RegionSet.h" #include "Resources.h" #include "ScopedFTZ.h" #include "SisterVoiceRing.h" #include "StringViewHelpers.h" -#include "Synth.h" #include "TriggerEvent.h" #include "utility/SpinMutex.h" #include "utility/XmlHelpers.h" +#include "Voice.h" #include "VoiceManager.h" +#include +#include +#include #include #include #include diff --git a/src/sfizz/Synth.h b/src/sfizz/Synth.h index b9611835..386ac863 100644 --- a/src/sfizz/Synth.h +++ b/src/sfizz/Synth.h @@ -5,14 +5,16 @@ // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz #pragma once -#include "Region.h" -#include "Voice.h" -#include "LeakDetector.h" #include "AudioSpan.h" +#include "LeakDetector.h" +#include "Resources.h" +#include "utility/NumericId.h" #include "parser/Parser.h" +#include #include #include -#include +#include +#include #include namespace sfz { @@ -21,6 +23,8 @@ namespace sfz { class RegionSet; class PolyphonyGroup; class EffectBus; +class Region; +class Voice; /** * @brief This class is the core of the sfizz library. In C++ it is the main point diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp index dcdfccd2..7940908e 100644 --- a/src/sfizz/Voice.cpp +++ b/src/sfizz/Voice.cpp @@ -4,15 +4,13 @@ // license. You should have receive a LICENSE.md file along with the code. // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz -#include "absl/algorithm/container.h" -#include "absl/types/span.h" +#include "Voice.h" #include "AudioBuffer.h" #include "Config.h" #include "Defaults.h" #include "EQPool.h" #include "FilterPool.h" #include "FlexEnvelope.h" -#include "HistoricalBuffer.h" #include "Interpolators.h" #include "LFO.h" #include "Macros.h" @@ -27,7 +25,8 @@ #include "SfzHelpers.h" #include "SIMDHelpers.h" #include "Smoothers.h" -#include "Voice.h" +#include +#include #include namespace sfz { diff --git a/src/sfizz/VoiceManager.h b/src/sfizz/VoiceManager.h index bdc3c6d1..627fd600 100644 --- a/src/sfizz/VoiceManager.h +++ b/src/sfizz/VoiceManager.h @@ -6,11 +6,11 @@ #pragma once -#include "Voice.h" -#include "Resources.h" #include "Config.h" -#include "Region.h" #include "PolyphonyGroup.h" +#include "Region.h" +#include "Resources.h" +#include "Voice.h" #include "VoiceStealing.h" #include diff --git a/src/sfizz/parser/Parser.h b/src/sfizz/parser/Parser.h index 057143ad..827de0c6 100644 --- a/src/sfizz/parser/Parser.h +++ b/src/sfizz/parser/Parser.h @@ -6,10 +6,10 @@ #pragma once #include "../Opcode.h" -#include "ghc/fs_std.hpp" -#include "absl/types/optional.h" -#include "absl/container/flat_hash_map.h" -#include "absl/container/flat_hash_set.h" +#include +#include +#include +#include #include #include diff --git a/tests/FilesT.cpp b/tests/FilesT.cpp index 02004ab7..28c41dd9 100644 --- a/tests/FilesT.cpp +++ b/tests/FilesT.cpp @@ -6,6 +6,7 @@ #include "TestHelpers.h" #include "sfizz/Synth.h" +#include "sfizz/Voice.h" #include "sfizz/SfzHelpers.h" #include "sfizz/modulations/ModId.h" #include "sfizz/modulations/ModKey.h" diff --git a/tests/LFOT.cpp b/tests/LFOT.cpp index 2271c2a8..9a7ac3ab 100644 --- a/tests/LFOT.cpp +++ b/tests/LFOT.cpp @@ -7,6 +7,7 @@ #include "DataHelpers.h" #include "sfizz/Synth.h" #include "sfizz/LFO.h" +#include "sfizz/Region.h" #include "catch2/catch.hpp" static bool computeLFO(DataPoints& dp, const fs::path& sfzPath, double sampleRate, size_t numFrames) diff --git a/tests/PlotLFO.cpp b/tests/PlotLFO.cpp index 8ce0aff5..c55a192f 100644 --- a/tests/PlotLFO.cpp +++ b/tests/PlotLFO.cpp @@ -17,6 +17,7 @@ #include "sfizz/Synth.h" #include "sfizz/LFO.h" +#include "sfizz/Region.h" #include "sfizz/LFODescription.h" #include "sfizz/MathHelpers.h" #include "cxxopts.hpp" diff --git a/tests/TestHelpers.h b/tests/TestHelpers.h index 4d059c45..31c5feb5 100644 --- a/tests/TestHelpers.h +++ b/tests/TestHelpers.h @@ -7,6 +7,7 @@ #pragma once #include "sfizz/Synth.h" #include "sfizz/Region.h" +#include "sfizz/Voice.h" #include "sfizz/modulations/ModKey.h" class RegionCCView {