diff options
Diffstat (limited to 'lib/libmodplug/src/sndfile.cpp')
| -rw-r--r-- | lib/libmodplug/src/sndfile.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libmodplug/src/sndfile.cpp b/lib/libmodplug/src/sndfile.cpp index 88baf2ebca..66defb2983 100644 --- a/lib/libmodplug/src/sndfile.cpp +++ b/lib/libmodplug/src/sndfile.cpp @@ -6,8 +6,8 @@ */ #include <math.h> //for GCCFIX -#include <libmodplug/stdafx.h> -#include <libmodplug/sndfile.h> +#include "libmodplug/stdafx.h" +#include "libmodplug/sndfile.h" #define MMCMP_SUPPORT @@ -1634,9 +1634,6 @@ void CSoundFile::AdjustSampleLoop(MODINSTRUMENT *pIns) DWORD CSoundFile::TransposeToFrequency(int transp, int ftune) //----------------------------------------------------------- { - //---GCCFIX: Removed assembly. - return (DWORD)(8363*pow(2, (transp*128+ftune)/(1536))); - #ifdef MSC_VER const float _fbase = 8363; const float _factor = 1.0f/(12.0f*128.0f); @@ -1666,6 +1663,9 @@ DWORD CSoundFile::TransposeToFrequency(int transp, int ftune) if (derr <= 5) freq -= derr; if (derr >= 995) freq += 1000-derr; return freq; +#else + //---GCCFIX: Removed assembly. + return (DWORD)(8363*pow(2, (transp*128+ftune)/(1536))); #endif } @@ -1674,9 +1674,6 @@ DWORD CSoundFile::TransposeToFrequency(int transp, int ftune) int CSoundFile::FrequencyToTranspose(DWORD freq) //---------------------------------------------- { - //---GCCFIX: Removed assembly. - return int(1536*(log(freq/8363)/log(2))); - #ifdef MSC_VER const float _f1_8363 = 1.0f / 8363.0f; const float _factor = 128 * 12; @@ -1692,6 +1689,9 @@ int CSoundFile::FrequencyToTranspose(DWORD freq) fistp result } return result; +#else + //---GCCFIX: Removed assembly. + return int(1536*(log(freq/8363)/log(2))); #endif } |