Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1505] trunk/OpenMPT/soundlib
|
From: <sag...@us...> - 2013-01-21 21:41:12
|
Revision: 1505
http://sourceforge.net/p/modplug/code/1505
Author: saga-games
Date: 2013-01-21 21:41:04 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
[Ref] Got rid of unused FASTSOUNDLIB queries.
Modified Paths:
--------------
trunk/OpenMPT/soundlib/Fastmix.cpp
trunk/OpenMPT/soundlib/RowVisitor.cpp
trunk/OpenMPT/soundlib/Snd_dsp.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Sndmix.cpp
trunk/OpenMPT/soundlib/Tables.cpp
trunk/OpenMPT/soundlib/Waveform.cpp
Modified: trunk/OpenMPT/soundlib/Fastmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Fastmix.cpp 2013-01-20 18:40:43 UTC (rev 1504)
+++ trunk/OpenMPT/soundlib/Fastmix.cpp 2013-01-21 21:41:04 UTC (rev 1505)
@@ -30,10 +30,8 @@
int MixReverbBuffer[MIXBUFFERSIZE * 2];
#endif
-#ifndef FASTSOUNDLIB
int MixRearBuffer[MIXBUFFERSIZE * 2];
float MixFloatBuffer[MIXBUFFERSIZE * 2];
-#endif
#pragma bss_seg()
@@ -529,7 +527,6 @@
SNDMIX_STOREMONOVOL
END_MIX_INTERFACE()
-#ifndef FASTSOUNDLIB
BEGIN_MIX_INTERFACE(Mono8BitHQMix)
SNDMIX_BEGINSAMPLELOOP8
SNDMIX_GETMONOVOL8HQSRC
@@ -541,10 +538,6 @@
SNDMIX_GETMONOVOL16HQSRC
SNDMIX_STOREMONOVOL
END_MIX_INTERFACE()
-#else
-#define Mono8BitHQMix Mono8BitLinearMix
-#define Mono16BitHQMix Mono16BitLinearMix
-#endif
// Volume Ramps
BEGIN_RAMPMIX_INTERFACE(Mono8BitRampMix)
@@ -571,7 +564,6 @@
SNDMIX_RAMPMONOVOL
END_RAMPMIX_INTERFACE()
-#ifndef FASTSOUNDLIB
BEGIN_RAMPMIX_INTERFACE(Mono8BitHQRampMix)
SNDMIX_BEGINSAMPLELOOP8
SNDMIX_GETMONOVOL8HQSRC
@@ -584,16 +576,9 @@
SNDMIX_RAMPMONOVOL
END_RAMPMIX_INTERFACE()
-#else
-#define Mono8BitHQRampMix Mono8BitLinearRampMix
-#define Mono16BitHQRampMix Mono16BitLinearRampMix
-#endif
-
//////////////////////////////////////////////////////
// 8-taps polyphase resampling filter
-#ifndef FASTSOUNDLIB
-
// Normal
BEGIN_MIX_INTERFACE(Mono8BitKaiserMix)
SNDMIX_INITSINCTABLE
@@ -624,22 +609,12 @@
SNDMIX_RAMPMONOVOL
END_RAMPMIX_INTERFACE()
-
-#else
-#define Mono8BitKaiserMix Mono8BitHQMix
-#define Mono16BitKaiserMix Mono16BitHQMix
-#define Mono8BitKaiserRampMix Mono8BitHQRampMix
-#define Mono16BitKaiserRampMix Mono16BitHQRampMix
-#endif
-
// -> BEHAVIOUR_CHANGE#0025
// -> DESC="enable polyphase resampling on stereo samples"
// rewbs.resamplerConf
//////////////////////////////////////////////////////
// FIR filter
-#ifndef FASTSOUNDLIB
-
// Normal
BEGIN_MIX_INTERFACE(Mono8BitFIRFilterMix)
//SNDMIX_INITSINCTABLE
@@ -670,13 +645,6 @@
SNDMIX_RAMPMONOVOL
END_RAMPMIX_INTERFACE()
-
-#else
-#define Mono8BitFIRFilterMix Mono8BitHQMix
-#define Mono16BitFIRFilterMix Mono16BitHQMix
-#define Mono8BitFIRFilterRampMix Mono8BitHQRampMix
-#define Mono16BitFIRFilterRampMix Mono16BitHQRampMix
-#endif
//end rewbs.resamplerConf
// -! BEHAVIOUR_CHANGE#0025
@@ -1492,10 +1460,8 @@
DWORD nchused, nchmixed;
if (!count) return 0;
-#ifndef FASTSOUNDLIB
BOOL bSurround;
if (gnChannels > 2) X86_InitMixBuffer(MixRearBuffer, count*2);
-#endif
nchused = nchmixed = 0;
for (UINT nChn=0; nChn<m_nMixChannels; nChn++)
{
@@ -1579,9 +1545,7 @@
pOfsR = &gnRvbROfsVol;
pOfsL = &gnRvbLOfsVol;
}
- #ifndef FASTSOUNDLIB
bSurround = (pbuffer == MixRearBuffer);
- #endif
#else
pbuffer = MixSoundBuffer;
#endif
@@ -2114,8 +2078,6 @@
//////////////////////////////////////////////////////////////////////////
// Noise Shaping (Dither)
-#ifndef FASTSOUNDLIB
-
#pragma warning(disable:4731) // ebp modified
void MPPASMCALL X86_Dither(int *pBuffer, UINT nSamples, UINT nBits)
@@ -2196,9 +2158,7 @@
}
}
-#endif // FASTSOUNDLIB
-
VOID MPPASMCALL X86_MonoFromStereo(int *pMixBuf, UINT nSamples)
//-------------------------------------------------------------
{
Modified: trunk/OpenMPT/soundlib/RowVisitor.cpp
===================================================================
--- trunk/OpenMPT/soundlib/RowVisitor.cpp 2013-01-20 18:40:43 UTC (rev 1504)
+++ trunk/OpenMPT/soundlib/RowVisitor.cpp 2013-01-21 21:41:04 UTC (rev 1505)
@@ -39,12 +39,15 @@
for(ORDERINDEX order = 0; order < endOrder; order++)
{
VisitedRowsBaseType &row = visitedRows[order];
- // If we want to reset the vectors completely, we overwrite existing items with false.
+ const size_t size = GetVisitedRowsVectorSize(sndFile.Order[order]);
if(reset)
{
- row.assign(row.size(), false);
+ // If we want to reset the vectors completely, we overwrite existing items with false.
+ row.assign(size, false);
+ } else
+ {
+ row.resize(size, false);
}
- row.resize(GetVisitedRowsVectorSize(sndFile.Order[order]), false);
}
}
Modified: trunk/OpenMPT/soundlib/Snd_dsp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_dsp.cpp 2013-01-20 18:40:43 UTC (rev 1504)
+++ trunk/OpenMPT/soundlib/Snd_dsp.cpp 2013-01-21 21:41:04 UTC (rev 1505)
@@ -279,7 +279,6 @@
}
-#ifndef FASTSOUNDLIB
// 4-channels surround
static void ProcessQuadSurround(int count)
//----------------------------------------
@@ -309,7 +308,6 @@
}
nDolbyHP_Y1 = hy1;
}
-#endif
void CSoundFile::ProcessStereoDSP(int count)
@@ -318,9 +316,7 @@
// Dolby Pro-Logic Surround
if (gdwSoundSetup & SNDMIX_SURROUND)
{
-#ifndef FASTSOUNDLIB
if (gnChannels > 2) ProcessQuadSurround(count); else
-#endif
ProcessStereoSurround(count);
}
// DC Removal
@@ -412,7 +408,6 @@
}
-#ifndef FASTSOUNDLIB
//////////////////////////////////////////////////////////////////////////
//
@@ -496,12 +491,10 @@
}
}
-#endif // FASTSOUNDLIB
-
/////////////////////////////////////////////////////////////////
// Clean DSP Effects interface
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2013-01-20 18:40:43 UTC (rev 1504)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2013-01-21 21:41:04 UTC (rev 1505)
@@ -4330,8 +4330,7 @@
//-----------------------------------
{
// ModPlug Tracker and Mod-Plugin don't do this check
-#ifndef MODPLUG_TRACKER
-#ifndef FASTSOUNDLIB
+#ifdef MODPLUG_PLAYER
// Big Hack!!!
if ((!param) || (param >= 0x80) || ((GetType() & (MOD_TYPE_MOD|MOD_TYPE_XM|MOD_TYPE_MT2)) && (param >= 0x1E)))
{
@@ -4340,8 +4339,7 @@
GlobalFadeSong(1000);
}
}
-#endif // FASTSOUNDLIB
-#endif // MODPLUG_TRACKER
+#endif // MODPLUG_PLAYER
// Allow high speed values here for VBlank MODs. (Maybe it would be better to have a "VBlank MOD" flag somewhere? Is it worth the effort?)
if ((param) && (param <= GetModSpecifications().speedMax || (GetType() & MOD_TYPE_MOD))) m_nMusicSpeed = param;
}
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2013-01-20 18:40:43 UTC (rev 1504)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2013-01-21 21:41:04 UTC (rev 1505)
@@ -34,7 +34,6 @@
"|mo3"
#endif
;
-//Should there be mptm?
#endif // NO_ARCHIVE_SUPPORT
#else // NO_COPYRIGHT: EarSaver only loads mod/s3m/xm/it/wav
#define MODPLUG_BASIC_SUPPORT
@@ -171,7 +170,7 @@
RPB. [EXT] nRowsPerBeat;
RPM. [EXT] nRowsPerMeasure;
RS.. nResSwing;
-SEP@ [EXT] chunk SEPARATOR tag
+SEP@ [EXT] chunk SEPARATOR tag
SPA. [EXT] m_nSamplePreAmp;
TM.. [EXT] nTempoMode;
VE.. VolEnv.nNodes;
@@ -258,8 +257,8 @@
fwrite(&dwFlags, 1, fsize, file);
}
-WRITE_MPTHEADER_sized_member( nGlobalVol , UINT , GV.. )
-WRITE_MPTHEADER_sized_member( nPan , UINT , P... )
+WRITE_MPTHEADER_sized_member( nGlobalVol , uint32 , GV.. )
+WRITE_MPTHEADER_sized_member( nPan , uint32 , P... )
WRITE_MPTHEADER_sized_member( VolEnv.nNodes , uint32 , VE.. )
WRITE_MPTHEADER_sized_member( PanEnv.nNodes , uint32 , PE.. )
WRITE_MPTHEADER_sized_member( PitchEnv.nNodes , uint32 , PiE. )
@@ -391,11 +390,11 @@
GET_MPTHEADER_sized_member( nPluginVelocityHandling , uint8 , PVEH )
GET_MPTHEADER_sized_member( nPluginVolumeHandling , uint8 , PVOH )
GET_MPTHEADER_sized_member( PitchEnv.nReleaseNode , uint8 , PERN )
-GET_MPTHEADER_sized_member( PanEnv.nReleaseNode , uint8 , AERN )
+GET_MPTHEADER_sized_member( PanEnv.nReleaseNode , uint8 , AERN )
GET_MPTHEADER_sized_member( VolEnv.nReleaseNode , uint8 , VERN )
-GET_MPTHEADER_sized_member( PitchEnv.dwFlags , DWORD , PFLG )
-GET_MPTHEADER_sized_member( PanEnv.dwFlags , DWORD , AFLG )
-GET_MPTHEADER_sized_member( VolEnv.dwFlags , DWORD , VFLG )
+GET_MPTHEADER_sized_member( PitchEnv.dwFlags , uint32 , PFLG )
+GET_MPTHEADER_sized_member( PanEnv.dwFlags , uint32 , AFLG )
+GET_MPTHEADER_sized_member( VolEnv.dwFlags , uint32 , VFLG )
GET_MPTHEADER_sized_member( midiPWD , int8 , MPWD )
}
@@ -612,7 +611,6 @@
#ifndef MODPLUG_BASIC_SUPPORT
&& !ReadSTM(file)
&& !ReadMed(lpStream, dwMemLength)
-#ifndef FASTSOUNDLIB
&& !ReadMTM(file)
&& !ReadMDL(lpStream, dwMemLength)
&& !ReadDBM(lpStream, dwMemLength)
@@ -634,7 +632,6 @@
#ifdef MODPLUG_TRACKER
&& !ReadMID(lpStream, dwMemLength)
#endif // MODPLUG_TRACKER
-#endif
#endif // MODPLUG_BASIC_SUPPORT
&& !ReadGDM(file)
&& !ReadIMF(lpStream, dwMemLength)
@@ -1411,8 +1408,6 @@
}
-#ifndef FASTSOUNDLIB
-
// Check whether a sample is used.
// In sample mode, the sample numbers in all patterns are checked.
// In instrument mode, it is only checked if a sample is referenced by an instrument (but not if the sample is actually played anywhere)
@@ -1598,7 +1593,6 @@
return true;
}
-#endif // FASTSOUNDLIB
void CSoundFile::DeleteStaticdata()
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2013-01-20 18:40:43 UTC (rev 1504)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2013-01-21 21:41:04 UTC (rev 1505)
@@ -472,7 +472,7 @@
public:
// Mixer Config
- static BOOL SetMixerSettings(const MixerSettings & mixersettings);
+ static void SetMixerSettings(const MixerSettings &mixersettings);
static MixerSettings GetMixerSettings();
static BOOL InitPlayer(BOOL bReset=FALSE);
static BOOL SetWaveConfig(UINT nRate,UINT nBits,UINT nChannels,BOOL bMMX=FALSE);
@@ -787,19 +787,15 @@
///////////////////////////////////////////////////////////
// File Formats Information (name, extension, etc)
-#ifndef FASTSOUNDLIB
-
-typedef struct MODFORMATINFO
+struct MODFORMATINFO
{
MODTYPE mtFormatId; // MOD_TYPE_XXXX
LPCSTR lpszFormatName; // "ProTracker"
LPCSTR lpszExtension; // ".xxx"
DWORD dwPadding;
-} MODFORMATINFO;
+};
-#endif
-
// Read instrument property with 'code' and 'size' from 'file' to instrument 'pIns'.
void ReadInstrumentExtensionField(ModInstrument* pIns, const uint32 code, const uint16 size, FileReader &file);
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2013-01-20 18:40:43 UTC (rev 1504)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2013-01-21 21:41:04 UTC (rev 1505)
@@ -63,7 +63,7 @@
extern VOID MPPASMCALL X86_InterleaveFrontRear(int *pFrontBuf, int *pRearBuf, DWORD nSamples);
extern VOID MPPASMCALL X86_StereoFill(int *pBuffer, UINT nSamples, LPLONG lpROfs, LPLONG lpLOfs);
extern VOID MPPASMCALL X86_MonoFromStereo(int *pMixBuf, UINT nSamples);
-extern void SndMixInitializeTables(const MixerSettings & mixersettings);
+extern void SndMixInitializeTables(const MixerSettings &mixersettings);
extern short int ModSinusTable[64];
extern short int ModRampDownTable[64];
@@ -162,7 +162,7 @@
neg eax
rneg:
mov result, eax
- }
+}
return result;
}
@@ -214,8 +214,8 @@
}
-BOOL CSoundFile::SetMixerSettings(const MixerSettings & mixersettings)
-//--------------------------------------------------------------------
+void CSoundFile::SetMixerSettings(const MixerSettings &mixersettings)
+//-------------------------------------------------------------------
{
// Start with ramping disabled to avoid clicks on first read.
@@ -226,12 +226,10 @@
gdWFIRCutoff = mixersettings.gdWFIRCutoff;
gbWFIRType = mixersettings.gbWFIRType;
-
- return TRUE;
}
MixerSettings CSoundFile::GetMixerSettings()
-//--------------------------------------------------------------------
+//------------------------------------------
{
MixerSettings mixersettings;
mixersettings.glVolumeRampUpSamples = gnVolumeRampUpSamplesTarget;
@@ -245,13 +243,12 @@
BOOL CSoundFile::InitPlayer(BOOL bReset)
//--------------------------------------
{
-#ifndef FASTSOUNDLIB
if (!gbInitTables)
{
SndMixInitializeTables(GetMixerSettings());
gbInitTables = true;
}
-#endif
+
if (m_nMaxMixChannels > MAX_CHANNELS) m_nMaxMixChannels = MAX_CHANNELS;
if (gdwMixingFreq < 4000) gdwMixingFreq = 4000;
if (gdwMixingFreq > MAX_SAMPLE_RATE) gdwMixingFreq = MAX_SAMPLE_RATE;
@@ -320,11 +317,9 @@
m_nMixStat = 0;
lSampleSize = gnChannels;
- if (gnBitsPerSample == 16) { lSampleSize *= 2; pCvt = X86_Convert32To16; }
-#ifndef FASTSOUNDLIB
- else if (gnBitsPerSample == 24) { lSampleSize *= 3; pCvt = X86_Convert32To24; }
- else if (gnBitsPerSample == 32) { lSampleSize *= 4; pCvt = X86_Convert32To32; }
-#endif // FASTSOUNDLIB
+ if(gnBitsPerSample == 16) { lSampleSize *= 2; pCvt = X86_Convert32To16; }
+ else if(gnBitsPerSample == 24) { lSampleSize *= 3; pCvt = X86_Convert32To24; }
+ else if(gnBitsPerSample == 32) { lSampleSize *= 4; pCvt = X86_Convert32To32; }
lMax = cbBuffer / lSampleSize;
if ((!lMax) || (!lpBuffer) || (!m_nChannels)) return 0;
@@ -338,13 +333,11 @@
if (!m_nBufferCount)
{
-#ifndef FASTSOUNDLIB
if(m_SongFlags[SONG_FADINGSONG])
{
m_SongFlags.set(SONG_ENDREACHED);
m_nBufferCount = lRead;
} else
-#endif // FASTSOUNDLIB
if (ReadNote())
{
@@ -367,9 +360,7 @@
}
#endif // MODPLUG_TRACKER
-#ifndef FASTSOUNDLIB
if (!FadeSong(FADESONGDELAY) || m_bIsRendering) //rewbs: disable song fade when rendering.
-#endif // FASTSOUNDLIB
{
m_SongFlags.set(SONG_ENDREACHED);
if (lRead == lMax || m_bIsRendering) //rewbs: don't complete buffer when rendering
@@ -453,16 +444,13 @@
UINT lTotalSampleCount = lSampleCount; // Including rear channels
-#ifndef FASTSOUNDLIB
// Multichannel
if (gnChannels > 2)
{
X86_InterleaveFrontRear(MixSoundBuffer, MixRearBuffer, lSampleCount);
lTotalSampleCount *= 2;
}
-#endif // FASTSOUNDLIB
-#ifndef FASTSOUNDLIB
// Noise Shaping
if (gnBitsPerSample <= 16)
{
@@ -477,7 +465,6 @@
//Currently only used for VU Meter, so it's OK to do it after global Vol.
gpSndMixHook(MixSoundBuffer, lTotalSampleCount, gnChannels);
}
-#endif // FASTSOUNDLIB
// Perform clipping
lpBuffer += pCvt(lpBuffer, MixSoundBuffer, lTotalSampleCount);
@@ -689,7 +676,7 @@
if (nStat2) { pSndFile->m_nMixStat += nStat2 - 1; pSndFile->m_nMixStat /= nStat2; }
return lMax - lRead;
}
-#endif // FASTSOUNDLIB
+#endif // MODPLUG_PLAYER
/////////////////////////////////////////////////////////////////////////////
@@ -1866,7 +1853,6 @@
LONG nRightDelta = ((pChn->nNewRightVol - pChn->nRightVol) << VOLUMERAMPPRECISION);
LONG nLeftDelta = ((pChn->nNewLeftVol - pChn->nLeftVol) << VOLUMERAMPPRECISION);
-#ifndef FASTSOUNDLIB
// if ((gdwSoundSetup & SNDMIX_DIRECTTODISK)
// || ((gdwSysInfo & (SYSMIX_ENABLEMMX|SYSMIX_FASTCPU))
// && (gdwSoundSetup & SNDMIX_HQRESAMPLER) && (gnCPUUsage <= 50)))
@@ -1886,7 +1872,6 @@
}
}
}
-#endif // FASTSOUNDLIB
pChn->nRightRamp = nRightDelta / rampLength;
pChn->nLeftRamp = nLeftDelta / rampLength;
@@ -2269,9 +2254,7 @@
pan /= 128;
pan += 128;
Limit(pan, 0, 256);
-#ifndef FASTSOUNDLIB
if (gdwSoundSetup & SNDMIX_REVERSESTEREO) pan = 256 - pan;
-#endif
LONG realvol;
if (m_pConfig->getUseGlobalPreAmp())
@@ -2316,7 +2299,7 @@
} else
{
pChn->dwFlags.reset(CHN_NOIDO | CHN_HQSRC);
-#ifndef FASTSOUNDLIB
+
if (pChn->nInc == 0x10000)
{
pChn->dwFlags.set(CHN_NOIDO);
@@ -2354,9 +2337,6 @@
|| ((gnCPUUsage > 80) && (pChn->nNewLeftVol < 0x100) && (pChn->nNewRightVol < 0x100)))
pChn->dwFlags.set(CHN_NOIDO);
}
-#else
- if (pChn->nInc >= 0xFE00) pChn->dwFlags.set(CHN_NOIDO);
-#endif // FASTSOUNDLIB
}
/*if (m_pConfig->getUseGlobalPreAmp())
Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp 2013-01-20 18:40:43 UTC (rev 1504)
+++ trunk/OpenMPT/soundlib/Tables.cpp 2013-01-21 21:41:04 UTC (rev 1505)
@@ -19,7 +19,6 @@
///////////////////////////////////////////////////////////////////////
-#ifndef FASTSOUNDLIB
/*MODFORMATINFO gModFormatInfo[] =
{
@@ -52,13 +51,9 @@
{ MOD_TYPE_IMF, "Imago Orpheus", ".imf", 0 },
};*/
-#endif
-
///////////////////////////////////////////////////////////////////////
-#ifndef FASTSOUNDLIB
#pragma data_seg(".tables")
#pragma bss_seg(".modplug")
-#endif
///////////////////////////////////////////////////////////////////////
@@ -496,7 +491,6 @@
};
-#ifndef FASTSOUNDLIB
// Reversed sinc coefficients
// we should avoid all compiler directives like this. It will cause errors in vanilla VC6.
@@ -663,5 +657,3 @@
//end ericus' downsampling improvement.
}
-
-#endif // not FASTSOUNDLIB
Modified: trunk/OpenMPT/soundlib/Waveform.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Waveform.cpp 2013-01-20 18:40:43 UTC (rev 1504)
+++ trunk/OpenMPT/soundlib/Waveform.cpp 2013-01-21 21:41:04 UTC (rev 1505)
@@ -12,8 +12,6 @@
#include "stdafx.h"
#include "sndfile.h"
-#ifndef FASTSOUNDLIB
-
#define ASM_NORMALIZE
#ifdef ASM_NORMALIZE
@@ -102,6 +100,3 @@
return i;
#endif
}
-
-
-#endif // FASTSOUNDLIB
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
