diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2003-05-22 16:51:37 +0000 |
|---|---|---|
| committer | Brian Cameron <brian.cameron@sun.com> | 2003-05-22 16:51:37 +0000 |
| commit | f4e4c4b31e0c04fb15424e85b3a5ccb0eeba917b (patch) | |
| tree | 1c46e20a1c27d0069dbbde258bbfeddaa13a5ed6 | |
| parent | 349abb3b0616471e8f3fafc3e05d72ee0a77ad80 (diff) | |
| download | gst-plugins-bad-f4e4c4b31e0c04fb15424e85b3a5ccb0eeba917b.tar.gz gst-plugins-bad-f4e4c4b31e0c04fb15424e85b3a5ccb0eeba917b.tar.bz2 gst-plugins-bad-f4e4c4b31e0c04fb15424e85b3a5ccb0eeba917b.zip | |
Forte is more picky about how the pow() and log() functions are called.
Original commit message from CVS:
Forte is more picky about how the pow() and log() functions are called.
| -rw-r--r-- | gst/modplug/libmodplug/snd_flt.cpp | 2 | ||||
| -rw-r--r-- | gst/modplug/libmodplug/sndfile.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gst/modplug/libmodplug/snd_flt.cpp b/gst/modplug/libmodplug/snd_flt.cpp index 0865e597..bcae2020 100644 --- a/gst/modplug/libmodplug/snd_flt.cpp +++ b/gst/modplug/libmodplug/snd_flt.cpp @@ -80,7 +80,7 @@ void CSoundFile::SetupChannelFilter(MODCHANNEL *pChn, BOOL bReset, int flt_modif float d = (1.0f-2.0f*dmpfac)* fc; if (d>2.0) d = 2.0; d = (2.0f*dmpfac - d)/fc; - float e = pow(1.0f/fc,2.0); + float e = pow(1.0f/fc, 2); fg=1/(1+d+e); fb0=(d+e+e)/(1+d+e); diff --git a/gst/modplug/libmodplug/sndfile.cpp b/gst/modplug/libmodplug/sndfile.cpp index c4db8bcf..7e31062b 100644 --- a/gst/modplug/libmodplug/sndfile.cpp +++ b/gst/modplug/libmodplug/sndfile.cpp @@ -1622,7 +1622,7 @@ DWORD CSoundFile::TransposeToFrequency(int transp, int ftune) //----------------------------------------------------------- { //---GCCFIX: Removed assembly. - return (DWORD)(8363*pow(2, (transp*128+ftune)/(1536))); + return (DWORD)(8363*pow(2.0, (transp*128+ftune)/(1536))); #ifdef MSC_VER const float _fbase = 8363; @@ -1662,7 +1662,7 @@ int CSoundFile::FrequencyToTranspose(DWORD freq) //---------------------------------------------- { //---GCCFIX: Removed assembly. - return int(1536*(log(freq/8363)/log(2))); + return int(1536*(log(freq/8363.0)/log(2.0))); #ifdef MSC_VER const float _f1_8363 = 1.0f / 8363.0f; |