From ef477dca90469060d7855e7ffd00dbe5168b1c22 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Tue, 28 Jan 2020 21:42:15 +0100 Subject: [PATCH] Correcting windows builds --- src/sfizz/Config.h | 3 ++- tests/FilesT.cpp | 2 ++ tests/OnePoleFilterT.cpp | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/sfizz/Config.h b/src/sfizz/Config.h index be67dd56..69bf58b9 100644 --- a/src/sfizz/Config.h +++ b/src/sfizz/Config.h @@ -11,6 +11,7 @@ #define _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING #endif #include +#include namespace sfz { enum class Oversampling: int { @@ -47,7 +48,7 @@ namespace config { constexpr float A440 { 440.0 }; constexpr size_t powerHistoryLength { 16 }; constexpr float voiceStealingThreshold { 0.00001f }; - constexpr int numCCs { 143 }; + constexpr uint8_t numCCs { 143 }; constexpr int chunkSize { 1024 }; constexpr float defaultAmpEGRelease { 0.02f }; } // namespace config diff --git a/tests/FilesT.cpp b/tests/FilesT.cpp index 632926c5..7e992371 100644 --- a/tests/FilesT.cpp +++ b/tests/FilesT.cpp @@ -486,6 +486,7 @@ TEST_CASE("[Files] Looped regions taken from files and possibly overriden") TEST_CASE("[Files] Case sentitiveness") { +#ifndef WIN32 sfz::Synth synth; synth.loadSfzFile(fs::current_path() / "tests/TestFiles/case_insensitive.sfz"); REQUIRE(synth.getNumRegions() == 4); @@ -493,4 +494,5 @@ TEST_CASE("[Files] Case sentitiveness") REQUIRE(synth.getRegionView(1)->sample == "Regions/dummy.wav"); REQUIRE(synth.getRegionView(2)->sample == "Regions/dummy.wav"); REQUIRE(synth.getRegionView(3)->sample == "Regions/dummy.wav"); +#endif } diff --git a/tests/OnePoleFilterT.cpp b/tests/OnePoleFilterT.cpp index fd282e2e..3350fa7d 100644 --- a/tests/OnePoleFilterT.cpp +++ b/tests/OnePoleFilterT.cpp @@ -10,6 +10,7 @@ // #include "ghc/fs_std.hpp" #include #include +#include #include #include using namespace Catch::literals;