Azahar-Mirror/soundtouch
1
0
Fork 0
mirror of https://github.com/azahar-emu/soundtouch synced 2025-11-07 15:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ambiguities in Solaris compilation

Browse Source
This commit is contained in:
oparviai 2009-02-25 17:13:51 +00:00
parent 4b591cdb12
commit 47659b0810
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/SoundStretch/soundstretch.vcproj
View File

@ -219,12 +219,6 @@
<File <File
RelativePath="RunParameters.h"> RelativePath="RunParameters.h">
</File> </File>
<File
RelativePath="..\..\..\include\SoundTouch.h">
</File>
<File
RelativePath="..\..\..\include\STTypes.h">
</File>
<File <File
RelativePath="WavFile.h"> RelativePath="WavFile.h">
</File> </File>

2
source/SoundTouch/FIRFilter.cpp
View File

@ -181,7 +181,7 @@ void FIRFilter::setCoefficients(const SAMPLETYPE *coeffs, uint newLength, uint u
assert(length == newLength); assert(length == newLength);
resultDivFactor = uResultDivFactor; resultDivFactor = uResultDivFactor;
resultDivider = (SAMPLETYPE)::pow(2, (int)resultDivFactor); resultDivider = (SAMPLETYPE)::pow(2.0, (int)resultDivFactor);
delete[] filterCoeffs; delete[] filterCoeffs;
filterCoeffs = new SAMPLETYPE[length]; filterCoeffs = new SAMPLETYPE[length];

2
source/SoundTouch/TDStretch.cpp
View File

@ -845,7 +845,7 @@ void TDStretch::calculateOverlapLength(int aoverlapMs)
overlapDividerBits = _getClosest2Power((sampleRate * aoverlapMs) / 1000.0); overlapDividerBits = _getClosest2Power((sampleRate * aoverlapMs) / 1000.0);
if (overlapDividerBits > 9) overlapDividerBits = 9; if (overlapDividerBits > 9) overlapDividerBits = 9;
if (overlapDividerBits < 4) overlapDividerBits = 4; if (overlapDividerBits < 4) overlapDividerBits = 4;
newOvl = (int)pow(2, overlapDividerBits); newOvl = (int)pow(2.0, (int)overlapDividerBits);
acceptNewOverlapLength(newOvl); acceptNewOverlapLength(newOvl);

15
source/SoundTouch/cpu_detect_x86_gcc.cpp
View File

@ -1,10 +1,9 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// ///
/// gcc version of the x86 CPU detect routine. /// Generic version of the x86 CPU extension detection routine.
/// ///
/// This file is to be compiled on any platform with the GNU C compiler. /// This file is for GNU & other non-Windows compilers, see 'cpu_detect_x86_win.cpp'
/// Compiler. Please see 'cpu_detect_x86_win.cpp' for the x86 Windows version /// for the Microsoft compiler version.
/// of this file.
/// ///
/// Author : Copyright (c) Olli Parviainen /// Author : Copyright (c) Olli Parviainen
/// Author e-mail : oparviai 'at' iki.fi /// Author e-mail : oparviai 'at' iki.fi
@ -45,20 +44,16 @@
#include "cpu_detect.h" #include "cpu_detect.h"
#include "STTypes.h" #include "STTypes.h"
#ifndef __GNUC__
#error wrong platform - this source code file is for the GNU C compiler.
#endif
using namespace std; using namespace std;
#include <stdio.h> #include <stdio.h>
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// //
// processor instructions extension detection routines // processor instructions extension detection routines
// //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Flag variable indicating whick ISA extensions are disabled (for debugging) // Flag variable indicating whick ISA extensions are disabled (for debugging)
static uint _dwDisabledISA = 0x00; // 0xffffffff; //<- use this to disable all extensions static uint _dwDisabledISA = 0x00; // 0xffffffff; //<- use this to disable all extensions
@ -73,7 +68,7 @@ void disableExtensions(uint dwDisableMask)
/// Checks which instruction set extensions are supported by the CPU. /// Checks which instruction set extensions are supported by the CPU.
uint detectCPUextensions(void) uint detectCPUextensions(void)
{ {
#ifndef ALLOW_X86_OPTIMIZATIONS #if (!(ALLOW_X86_OPTIMIZATIONS) || !(__GNUC__))
return 0; // always disable extensions on non-x86 platforms. return 0; // always disable extensions on non-x86 platforms.