diff options
| author | Colin Snover | 2016-11-25 12:24:08 -0600 |
|---|---|---|
| committer | Colin Snover | 2016-11-25 12:24:08 -0600 |
| commit | df4a503622a524ad8ef47e1c325ac4a711549921 (patch) | |
| tree | 29ac9e6d51fd4cd17e4ebe9d1f66ff93abd0cd9d /audio/softsynth/mt32/LA32WaveGenerator.cpp | |
| parent | b4dbd6d3c275097b4be964b7da4478ff930cbaa7 (diff) | |
| download | scummvm-rg350-df4a503622a524ad8ef47e1c325ac4a711549921.tar.gz scummvm-rg350-df4a503622a524ad8ef47e1c325ac4a711549921.tar.bz2 scummvm-rg350-df4a503622a524ad8ef47e1c325ac4a711549921.zip | |
Revert "MT32: Update Munt to 2.0.0"
This reverts commit b4dbd6d3c275097b4be964b7da4478ff930cbaa7.
Diffstat (limited to 'audio/softsynth/mt32/LA32WaveGenerator.cpp')
| -rw-r--r-- | audio/softsynth/mt32/LA32WaveGenerator.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/audio/softsynth/mt32/LA32WaveGenerator.cpp b/audio/softsynth/mt32/LA32WaveGenerator.cpp index 6a8a5b3998..765f75fa61 100644 --- a/audio/softsynth/mt32/LA32WaveGenerator.cpp +++ b/audio/softsynth/mt32/LA32WaveGenerator.cpp @@ -1,5 +1,5 @@ /* Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 Dean Beeler, Jerome Fisher - * Copyright (C) 2011-2016 Dean Beeler, Jerome Fisher, Sergey V. Mikayev + * Copyright (C) 2011, 2012, 2013, 2014 Dean Beeler, Jerome Fisher, Sergey V. Mikayev * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -15,19 +15,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <cstddef> - -#include "internals.h" - -#include "LA32WaveGenerator.h" -#include "Tables.h" - #if MT32EMU_USE_FLOAT_SAMPLES -#define MT32EMU_LA32_WAVE_GENERATOR_CPP #include "LA32FloatWaveGenerator.cpp" -#undef MT32EMU_LA32_WAVE_GENERATOR_CPP #else +//#include <cmath> +#include "mt32emu.h" +#include "mmath.h" +#include "internals.h" + namespace MT32Emu { static const Bit32u SINE_SEGMENT_RELATIVE_LENGTH = 1 << 18; @@ -427,6 +423,6 @@ bool LA32PartialPair::isActive(const PairType useMaster) const { return useMaster == MASTER ? master.isActive() : slave.isActive(); } -} // namespace MT32Emu +} #endif // #if MT32EMU_USE_FLOAT_SAMPLES |