diff options
author | Alexander Chemeris <alexander.chemeris@gmail.com> | 2008-10-03 04:38:47 +0400 |
---|---|---|
committer | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2008-10-03 04:38:47 +0400 |
commit | 42ef4a1d79eb85d450686e633500bc85450d8036 (patch) | |
tree | 823e523da7cf8d49c7933184a8aa754a680f04b0 | |
parent | a0336c33b7eca71e6786a8c7e8c28213b6daa162 (diff) |
Fix for VS files to include multi-channel changes. Also patches scal.c for
compilers that don't have M_PI defined.
-rwxr-xr-x[-rw-r--r--] | libspeex/scal.c | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | win32/VS2003/libspeexdsp/libspeexdsp.vcproj | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | win32/VS2005/libspeexdsp/libspeexdsp.vcproj | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | win32/VS2008/libspeexdsp/libspeexdsp.vcproj | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | win32/libspeex/libspeexdsp.dsp | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | win32/libspeex/libspeexdsp_dynamic.dsp | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | win32/libspeexdsp.def | 4 |
7 files changed, 27 insertions, 0 deletions
diff --git a/libspeex/scal.c b/libspeex/scal.c index 1ddaba2..358f817 100644..100755 --- a/libspeex/scal.c +++ b/libspeex/scal.c @@ -52,6 +52,10 @@ The algorithm implemented here is described in: #include <math.h> #include <stdlib.h> +#ifndef M_PI +#define M_PI 3.14159265358979323846 /* pi */ +#endif + #define ALLPASS_ORDER 20 struct SpeexDecorrState_ { diff --git a/win32/VS2003/libspeexdsp/libspeexdsp.vcproj b/win32/VS2003/libspeexdsp/libspeexdsp.vcproj index 23bd146..1fc21ad 100644..100755 --- a/win32/VS2003/libspeexdsp/libspeexdsp.vcproj +++ b/win32/VS2003/libspeexdsp/libspeexdsp.vcproj @@ -253,6 +253,9 @@ RelativePath="..\..\..\libspeex\resample.c">
</File>
<File
+ RelativePath="..\..\..\libspeex\scal.c">
+ </File>
+ <File
RelativePath="..\..\..\libspeex\smallft.c">
</File>
</Filter>
diff --git a/win32/VS2005/libspeexdsp/libspeexdsp.vcproj b/win32/VS2005/libspeexdsp/libspeexdsp.vcproj index 309f28a..2d22d6a 100644..100755 --- a/win32/VS2005/libspeexdsp/libspeexdsp.vcproj +++ b/win32/VS2005/libspeexdsp/libspeexdsp.vcproj @@ -1509,6 +1509,10 @@ >
</File>
<File
+ RelativePath="..\..\..\libspeex\scal.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\libspeex\smallft.c"
>
</File>
diff --git a/win32/VS2008/libspeexdsp/libspeexdsp.vcproj b/win32/VS2008/libspeexdsp/libspeexdsp.vcproj index f673eb1..5904b94 100644..100755 --- a/win32/VS2008/libspeexdsp/libspeexdsp.vcproj +++ b/win32/VS2008/libspeexdsp/libspeexdsp.vcproj @@ -356,6 +356,10 @@ >
</File>
<File
+ RelativePath="..\..\..\libspeex\scal.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\libspeex\smallft.c"
>
</File>
diff --git a/win32/libspeex/libspeexdsp.dsp b/win32/libspeex/libspeexdsp.dsp index 0e39ada..6accbd8 100644..100755 --- a/win32/libspeex/libspeexdsp.dsp +++ b/win32/libspeex/libspeexdsp.dsp @@ -125,6 +125,10 @@ SOURCE=..\..\libspeex\resample.c # End Source File
# Begin Source File
+SOURCE=..\..\libspeex\scal.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\libspeex\smallft.c
# End Source File
# End Group
diff --git a/win32/libspeex/libspeexdsp_dynamic.dsp b/win32/libspeex/libspeexdsp_dynamic.dsp index 1a1a211..ac40b38 100644..100755 --- a/win32/libspeex/libspeexdsp_dynamic.dsp +++ b/win32/libspeex/libspeexdsp_dynamic.dsp @@ -130,6 +130,10 @@ SOURCE=..\..\libspeex\resample.c # End Source File
# Begin Source File
+SOURCE=..\..\libspeex\scal.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\libspeex\smallft.c
# End Source File
# End Group
diff --git a/win32/libspeexdsp.def b/win32/libspeexdsp.def index bea3358..45fc69d 100644..100755 --- a/win32/libspeexdsp.def +++ b/win32/libspeexdsp.def @@ -17,6 +17,7 @@ speex_buffer_resize ; speex_echo.h ; speex_echo_state_init +speex_echo_state_init_mc speex_echo_state_destroy speex_echo_cancellation speex_echo_cancel @@ -24,6 +25,9 @@ speex_echo_capture speex_echo_playback speex_echo_state_reset speex_echo_ctl +speex_decorrelate_new +speex_decorrelate +speex_decorrelate_destroy ; ; speex_jitter.h |