diff options
| author | John Novak <john@johnovak.net> | 2022-08-07 03:49:59 +0300 |
|---|---|---|
| committer | John Novak <john@johnovak.net> | 2022-08-07 03:49:59 +0300 |
| commit | fde7471a4d8869cb4e2c8b112acb7b8b9d7465c0 (patch) | |
| tree | c0d0ae369b13c9d3fb83e7d2ab41605eb4fae9b0 | |
| parent | 32a4e280481e009e1f5b310a2d8cb1903655775a (diff) | |
MSVC fixeskc/compressor-float-compare-2
| -rw-r--r-- | src/hardware/compressor.cpp | 5 | ||||
| -rw-r--r-- | src/hardware/compressor_f.cpp | 3 | ||||
| -rw-r--r-- | vs/dosbox.vcxproj | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/hardware/compressor.cpp b/src/hardware/compressor.cpp index fe4467370..d8c763126 100644 --- a/src/hardware/compressor.cpp +++ b/src/hardware/compressor.cpp @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include <algorithm> #include <cmath> #include "mixer.h" @@ -94,8 +95,8 @@ AudioFrame Compressor::Process(const AudioFrame &in) if (over_db > max_over_db) { max_over_db = over_db; const auto i = std::clamp(static_cast<unsigned long>(std::fabs(over_db)), - 0ul, - attack_times_ms.size() - 1); + static_cast<unsigned long>(0ul), + static_cast<unsigned long>(attack_times_ms.size() - 1)); attack_time_ms = attack_times_ms[i]; attack_coeff = exp(-1.0 / (attack_time_ms * sample_rate_hz)); } diff --git a/src/hardware/compressor_f.cpp b/src/hardware/compressor_f.cpp index 75988f99a..5595fa33c 100644 --- a/src/hardware/compressor_f.cpp +++ b/src/hardware/compressor_f.cpp @@ -20,6 +20,7 @@ #include "compressor_f.h" +#include <algorithm> #include <array> #include <cmath> @@ -100,7 +101,7 @@ AudioFrame Compressor_f::Process(const AudioFrame &in) max_over_db = over_db; constexpr auto max_i = attack_times_ms.size() - 1; const auto i = std::clamp( - static_cast<unsigned long>(std::fabs(over_db)), 0ul, max_i); + static_cast<unsigned long>(std::fabs(over_db)), 0ul, static_cast<unsigned long>(max_i)); attack_time_ms = attack_times_ms[i]; attack_coeff = expf(-1.0f / (attack_time_ms * sample_rate_hz)); } diff --git a/vs/dosbox.vcxproj b/vs/dosbox.vcxproj index 1ea7485d0..014297b20 100644 --- a/vs/dosbox.vcxproj +++ b/vs/dosbox.vcxproj @@ -568,6 +568,7 @@ IF %ERRORLEVEL% LSS 8 SET ERRORLEVEL = 0</Command> <ClCompile Include="..\src\hardware\cmos.cpp" /> <ClCompile Include="..\src\hardware\covox.cpp" /> <ClCompile Include="..\src\hardware\compressor.cpp" /> + <ClCompile Include="..\src\hardware\compressor_f.cpp" /> <ClCompile Include="..\src\hardware\disney.cpp" /> <ClCompile Include="..\src\hardware\dma.cpp" /> <ClCompile Include="..\src\hardware\envelope.cpp" /> |