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/mmath.h | |
| 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/mmath.h')
| -rw-r--r-- | audio/softsynth/mt32/mmath.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/audio/softsynth/mt32/mmath.h b/audio/softsynth/mt32/mmath.h index f233bedcbb..602242e74f 100644 --- a/audio/softsynth/mt32/mmath.h +++ b/audio/softsynth/mt32/mmath.h @@ -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 @@ -18,7 +18,12 @@ #ifndef MT32EMU_MMATH_H #define MT32EMU_MMATH_H -#include <cmath> +#define FIXEDPOINT_UDIV(x, y, point) (((x) << (point)) / ((y))) +#define FIXEDPOINT_SDIV(x, y, point) (((x) * (1 << point)) / ((y))) +#define FIXEDPOINT_UMULT(x, y, point) (((x) * (y)) >> point) +#define FIXEDPOINT_SMULT(x, y, point) (((x) * (y)) / (1 << point)) + +#define FIXEDPOINT_MAKE(x, point) ((Bit32u)((1 << point) * x)) namespace MT32Emu { @@ -41,7 +46,7 @@ static inline float EXPF(float x) { static inline float EXP2F(float x) { #ifdef __APPLE__ // on OSX exp2f() is 1.59 times faster than "exp() and the multiplication with FLOAT_LN_2" - return exp2f(x); + return exp2(x); #else return exp(FLOAT_LN_2 * x); #endif @@ -63,6 +68,6 @@ static inline float LOG10F(float x) { return log10(x); } -} // namespace MT32Emu +} -#endif // #ifndef MT32EMU_MMATH_H +#endif |