diff options
author | Underground78 <underground78@users.sourceforge.net> | 2011-08-11 01:56:33 +0400 |
---|---|---|
committer | Underground78 <underground78@users.sourceforge.net> | 2011-08-11 01:56:33 +0400 |
commit | 24fc79bfb297d24b091e6950f9277edfe9e88c84 (patch) | |
tree | f9aa2d75218296ce904ffb68c36b2462a67fa1bf /src/thirdparty/SoundTouch/source/FIRFilter.cpp | |
parent | 9c37b8ef1e0ee7e34b4640255c941c52d9387386 (diff) |
Update SoundTouch to v1.6.1pre r130 (vanilla except that MMX is disabled for x64 to fix compilation). Patch by XhmikosR.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3642 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/thirdparty/SoundTouch/source/FIRFilter.cpp')
-rw-r--r-- | src/thirdparty/SoundTouch/source/FIRFilter.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/thirdparty/SoundTouch/source/FIRFilter.cpp b/src/thirdparty/SoundTouch/source/FIRFilter.cpp index 50c4f62ee..a2745625c 100644 --- a/src/thirdparty/SoundTouch/source/FIRFilter.cpp +++ b/src/thirdparty/SoundTouch/source/FIRFilter.cpp @@ -219,7 +219,7 @@ uint FIRFilter::evaluate(SAMPLETYPE *dest, const SAMPLETYPE *src, uint numSample // Operator 'new' is overloaded so that it automatically creates a suitable instance
// depending on if we've a MMX-capable CPU available or not.
-void * FIRFilter::operator new(size_t /*s*/)
+void * FIRFilter::operator new(size_t s)
{
// Notice! don't use "new FIRFilter" directly, use "newInstance" to create a new instance instead!
throw std::runtime_error("Error in FIRFilter::new: Don't use 'new FIRFilter', use 'newInstance' member instead!");
@@ -229,7 +229,6 @@ void * FIRFilter::operator new(size_t /*s*/) FIRFilter * FIRFilter::newInstance()
{
-#ifndef _WIN64 //mpc custom code
uint uExtensions;
uExtensions = detectCPUextensions();
@@ -254,8 +253,6 @@ FIRFilter * FIRFilter::newInstance() else
#endif // SOUNDTOUCH_ALLOW_SSE
-#endif // _WIN64 mpc custom code
-
{
// ISA optimizations not supported, use plain C version
return ::new FIRFilter;
|