gosu 1.3.0 → 1.4.0

data/dependencies/SDL_sound/libmodplug/fastmix.c

@@ -8,9 +8,6 @@
 #include "libmodplug.h"
 #include <math.h>
 
-// 4x256 taps polyphase FIR resampling filter
-extern short int gFastSinc[];
-extern short int gKaiserSinc[]; // 8-taps polyphase
 /*
  *-----------------------------------------------------------------------------
  cubic spline interpolation doc,
@@ -67,9 +64,9 @@ extern short int gKaiserSinc[]; // 8-taps polyphase
 #define SPLINE_FRACBITS 10
 #define SPLINE_LUTLEN (1L<<SPLINE_FRACBITS)
 
-signed short CzCUBICSPLINE_lut[4*(1L<<SPLINE_FRACBITS)];
+static signed short CzCUBICSPLINE_lut[4*(1L<<SPLINE_FRACBITS)];
 
-static void initCzCUBICSPLINE()
+static void initCzCUBICSPLINE(void)
 {
 	int _LIi;
 	int _LLen		= (1L<<SPLINE_FRACBITS);
@@ -105,9 +102,9 @@ static void initCzCUBICSPLINE()
    fir interpolation doc,
      (derived from "an engineer's guide to fir digital filters", n.j. loy)
 
-     calculate coefficients for ideal lowpass filter (with cutoff = fc in 
+     calculate coefficients for ideal lowpass filter (with cutoff = fc in
 	0..1 (mapped to 0..nyquist))
-     c[-N..N] = (i==0) ? fc : SDL_sin(fc*pi*i)/(pi*i)
+     c[-N..N] = (i==0) ? fc : sin(fc*pi*i)/(pi*i)
 
      then apply selected window to coefficients
       c[-N..N] *= w(0..N)
@@ -147,9 +144,9 @@ static void initCzCUBICSPLINE()
 #define M_zEPS		1e-8
 #define M_zBESSELEPS	1e-21
 
-    static float CzWINDOWEDFIR_coef( int _PCnr, float _POfs, float _PCut, int _PWidth, int _PType )
+static float CzWINDOWEDFIR_coef( int _PCnr, float _POfs, float _PCut, int _PWidth, int _PType )
 //OLD args to coef: float _PPos, float _PFc, int _PLen )
-	{	
+{
 		double	_LWidthM1       = _PWidth-1;
 		double	_LWidthM1Half   = 0.5*_LWidthM1;
 		double	_LPosU          = ((double)_PCnr - _POfs);
@@ -159,9 +156,9 @@ static void initCzCUBICSPLINE()
 		if( SDL_fabs(_LPos)<M_zEPS ) {
 			_LWc	= 1.0;
 			_LSi	= _PCut;
-		} else {	
+		} else {
 			switch( _PType )
-			{	
+			{
 			case WFIR_HANN:
 				_LWc = 0.50 - 0.50 * SDL_cos(_LPIdl*_LPosU);
 				break;
@@ -203,19 +200,19 @@ static void initCzCUBICSPLINE()
 			_LSi	 = SDL_sin(_PCut*_LPos)/_LPos;
 		}
 		return (float)(_LWc*_LSi);
-	}
+}
 
 static signed short CzWINDOWEDFIR_lut[WFIR_LUTLEN*WFIR_WIDTH];
 
-static void initCzWINDOWEDFIR()
-{	
+static void initCzWINDOWEDFIR(void)
+{
 	int _LPcl;
 	float _LPcllen	= (float)(1L<<WFIR_FRACBITS);	// number of precalculated lines for 0..1 (-1..0)
 	float _LNorm	= 1.0f / (float)(2.0f * _LPcllen);
 	float _LCut		= WFIR_CUTOFF;
 	float _LScale	= (float)WFIR_QUANTSCALE;
 	for( _LPcl=0;_LPcl<WFIR_LUTLEN;_LPcl++ )
-	{	
+	{
 		float _LGain,_LCoefs[WFIR_WIDTH];
 		float _LOfs		= ((float)_LPcl-_LPcllen)*_LNorm;
 		int _LCc,_LIdx	= _LPcl<<WFIR_LOG2WIDTH;
@@ -225,7 +222,7 @@ static void initCzWINDOWEDFIR()
 		_LGain = 1.0f/_LGain;
 		for( _LCc=0;_LCc<WFIR_WIDTH;_LCc++ )
 		{	float _LCoef = (float)floor( 0.5 + _LScale*_LCoefs[_LCc]*_LGain );
-		CzWINDOWEDFIR_lut[_LIdx+_LCc] = (signed short)( (_LCoef<-_LScale)?-_LScale:((_LCoef>_LScale)?_LScale:_LCoef) );
+			CzWINDOWEDFIR_lut[_LIdx+_LCc] = (signed short)( (_LCoef<-_LScale)?-_LScale:((_LCoef>_LScale)?_LScale:_LCoef) );
 		}
 	}
 }
@@ -620,11 +617,9 @@ typedef VOID (MPPASMCALL * LPMIXINTERFACE)(MODCHANNEL *, int *, int *);
 /////////////////////////////////////////////////////
 //
 
-void MPPASMCALL X86_InitMixBuffer(int *pBuffer, UINT nSamples);
-void MPPASMCALL X86_EndChannelOfs(MODCHANNEL *pChannel, int *pBuffer, UINT nSamples);
+static void MPPASMCALL X86_InitMixBuffer(int *pBuffer, UINT nSamples);
+static void MPPASMCALL X86_EndChannelOfs(MODCHANNEL *pChannel, int *pBuffer, UINT nSamples);
 void MPPASMCALL X86_StereoFill(int *pBuffer, UINT nSamples, LPLONG lpROfs, LPLONG lpLOfs);
-void X86_StereoMixToFloat(const int *, float *, float *, UINT nCount);
-void X86_FloatToStereoMix(const float *pIn1, const float *pIn2, int *pOut, UINT nCount);
 
 /////////////////////////////////////////////////////
 // Mono samples functions
@@ -1226,88 +1221,88 @@ END_RAMPMIX_STFLT_INTERFACE()
 #define MIXNDX_SPLINESRC    0x20
 #define MIXNDX_FIRSRC       0x30
 
-const LPMIXINTERFACE gpMixFunctionTable[2*2*16] =
+static const LPMIXINTERFACE gpMixFunctionTable[2*2*16] =
 {
 	// No SRC
 	Mono8BitMix, Mono16BitMix, Stereo8BitMix, Stereo16BitMix,
-	Mono8BitRampMix, Mono16BitRampMix, Stereo8BitRampMix, 
+	Mono8BitRampMix, Mono16BitRampMix, Stereo8BitRampMix,
             Stereo16BitRampMix,
 	// No SRC, Filter
-	FilterMono8BitMix, FilterMono16BitMix, FilterStereo8BitMix, 
-        FilterStereo16BitMix, FilterMono8BitRampMix, FilterMono16BitRampMix, 
+	FilterMono8BitMix, FilterMono16BitMix, FilterStereo8BitMix,
+        FilterStereo16BitMix, FilterMono8BitRampMix, FilterMono16BitRampMix,
 	FilterStereo8BitRampMix, FilterStereo16BitRampMix,
 	// Linear SRC
 	Mono8BitLinearMix, Mono16BitLinearMix, Stereo8BitLinearMix,
 	Stereo16BitLinearMix, Mono8BitLinearRampMix, Mono16BitLinearRampMix,
 	Stereo8BitLinearRampMix,Stereo16BitLinearRampMix,
 	// Linear SRC, Filter
-	FilterMono8BitLinearMix, FilterMono16BitLinearMix, 
+	FilterMono8BitLinearMix, FilterMono16BitLinearMix,
         FilterStereo8BitLinearMix, FilterStereo16BitLinearMix,
 	FilterMono8BitLinearRampMix, FilterMono16BitLinearRampMix,
         FilterStereo8BitLinearRampMix, FilterStereo16BitLinearRampMix,
 
 	// FirFilter SRC
-	Mono8BitSplineMix, Mono16BitSplineMix, Stereo8BitSplineMix, 
+	Mono8BitSplineMix, Mono16BitSplineMix, Stereo8BitSplineMix,
         Stereo16BitSplineMix, Mono8BitSplineRampMix, Mono16BitSplineRampMix,
 	Stereo8BitSplineRampMix,Stereo16BitSplineRampMix,
 	// Spline SRC, Filter
-	FilterMono8BitSplineMix, FilterMono16BitSplineMix, 
+	FilterMono8BitSplineMix, FilterMono16BitSplineMix,
         FilterStereo8BitSplineMix, FilterStereo16BitSplineMix,
 	FilterMono8BitSplineRampMix, FilterMono16BitSplineRampMix,
         FilterStereo8BitSplineRampMix, FilterStereo16BitSplineRampMix,
 
 	// FirFilter  SRC
 	Mono8BitFirFilterMix, Mono16BitFirFilterMix, Stereo8BitFirFilterMix,
-	Stereo16BitFirFilterMix, Mono8BitFirFilterRampMix, 
-        Mono16BitFirFilterRampMix, Stereo8BitFirFilterRampMix, 
+	Stereo16BitFirFilterMix, Mono8BitFirFilterRampMix,
+        Mono16BitFirFilterRampMix, Stereo8BitFirFilterRampMix,
         Stereo16BitFirFilterRampMix,
 	// FirFilter  SRC, Filter
-	FilterMono8BitFirFilterMix, FilterMono16BitFirFilterMix, 
+	FilterMono8BitFirFilterMix, FilterMono16BitFirFilterMix,
         FilterStereo8BitFirFilterMix, FilterStereo16BitFirFilterMix,
 	FilterMono8BitFirFilterRampMix, FilterMono16BitFirFilterRampMix,
         FilterStereo8BitFirFilterRampMix, FilterStereo16BitFirFilterRampMix
 };
 
-const LPMIXINTERFACE gpFastMixFunctionTable[2*2*16] =
+static const LPMIXINTERFACE gpFastMixFunctionTable[2*2*16] =
 {
 	// No SRC
 	FastMono8BitMix, FastMono16BitMix, Stereo8BitMix, Stereo16BitMix,
 	FastMono8BitRampMix, FastMono16BitRampMix, Stereo8BitRampMix,
         Stereo16BitRampMix,
 	// No SRC, Filter
-	FilterMono8BitMix, FilterMono16BitMix, FilterStereo8BitMix, 
+	FilterMono8BitMix, FilterMono16BitMix, FilterStereo8BitMix,
         FilterStereo16BitMix, FilterMono8BitRampMix, FilterMono16BitRampMix,
         FilterStereo8BitRampMix, FilterStereo16BitRampMix,
 	// Linear SRC
 	FastMono8BitLinearMix, FastMono16BitLinearMix, Stereo8BitLinearMix,
-        Stereo16BitLinearMix, FastMono8BitLinearRampMix, 
-        FastMono16BitLinearRampMix, Stereo8BitLinearRampMix, 
+        Stereo16BitLinearMix, FastMono8BitLinearRampMix,
+        FastMono16BitLinearRampMix, Stereo8BitLinearRampMix,
         Stereo16BitLinearRampMix,
 	// Linear SRC, Filter
-	FilterMono8BitLinearMix, FilterMono16BitLinearMix, 
+	FilterMono8BitLinearMix, FilterMono16BitLinearMix,
         FilterStereo8BitLinearMix, FilterStereo16BitLinearMix,
-	FilterMono8BitLinearRampMix, FilterMono16BitLinearRampMix, 
+	FilterMono8BitLinearRampMix, FilterMono16BitLinearRampMix,
         FilterStereo8BitLinearRampMix, FilterStereo16BitLinearRampMix,
 
 	// Spline SRC
-	Mono8BitSplineMix, Mono16BitSplineMix, Stereo8BitSplineMix, 
+	Mono8BitSplineMix, Mono16BitSplineMix, Stereo8BitSplineMix,
         Stereo16BitSplineMix, Mono8BitSplineRampMix, Mono16BitSplineRampMix,
         Stereo8BitSplineRampMix, Stereo16BitSplineRampMix,
 	// Spline SRC, Filter
-	FilterMono8BitSplineMix, FilterMono16BitSplineMix, 
+	FilterMono8BitSplineMix, FilterMono16BitSplineMix,
         FilterStereo8BitSplineMix, FilterStereo16BitSplineMix,
-	FilterMono8BitSplineRampMix, FilterMono16BitSplineRampMix, 
+	FilterMono8BitSplineRampMix, FilterMono16BitSplineRampMix,
         FilterStereo8BitSplineRampMix, FilterStereo16BitSplineRampMix,
 
 	// FirFilter SRC
 	Mono8BitFirFilterMix, Mono16BitFirFilterMix, Stereo8BitFirFilterMix,
-        Stereo16BitFirFilterMix, Mono8BitFirFilterRampMix, 
-        Mono16BitFirFilterRampMix, Stereo8BitFirFilterRampMix, 
+        Stereo16BitFirFilterMix, Mono8BitFirFilterRampMix,
+        Mono16BitFirFilterRampMix, Stereo8BitFirFilterRampMix,
         Stereo16BitFirFilterRampMix,
 	// FirFilter SRC, Filter
-	FilterMono8BitFirFilterMix, FilterMono16BitFirFilterMix, 
+	FilterMono8BitFirFilterMix, FilterMono16BitFirFilterMix,
         FilterStereo8BitFirFilterMix, FilterStereo16BitFirFilterMix,
-	FilterMono8BitFirFilterRampMix, FilterMono16BitFirFilterRampMix, 
+	FilterMono8BitFirFilterRampMix, FilterMono16BitFirFilterRampMix,
         FilterStereo8BitFirFilterRampMix, FilterStereo16BitFirFilterRampMix,
 };
 
@@ -1330,7 +1325,7 @@ static LONG MPPFASTCALL GetSampleCount(MODCHANNEL *pChn, LONG nSamples)
 			LONG nDelta = ((nLoopStart - pChn->nPos) << 16) - (pChn->nPosLo & 0xffff);
 			pChn->nPos = nLoopStart | (nDelta>>16);
 			pChn->nPosLo = nDelta & 0xffff;
-			if (((LONG)pChn->nPos < nLoopStart) || 
+			if (((LONG)pChn->nPos < nLoopStart) ||
 				(pChn->nPos >= (nLoopStart+pChn->nLength)/2))
 			{
 				pChn->nPos = nLoopStart; pChn->nPosLo = 0;
@@ -1346,7 +1341,7 @@ static LONG MPPFASTCALL GetSampleCount(MODCHANNEL *pChn, LONG nSamples)
 			}
 		} else
 		{
-			// We probably didn't hit the loop end yet 
+			// We probably didn't hit the loop end yet
 			// (first loop), so we do nothing
 			if ((LONG)pChn->nPos < 0) pChn->nPos = 0;
 		}
@@ -1369,8 +1364,8 @@ static LONG MPPFASTCALL GetSampleCount(MODCHANNEL *pChn, LONG nSamples)
 			LONG nDeltaLo = 0x10000 - (pChn->nPosLo & 0xffff);
 			pChn->nPos = pChn->nLength - nDeltaHi - (nDeltaLo>>16);
 			pChn->nPosLo = nDeltaLo & 0xffff;
-			if ((pChn->nPos <= pChn->nLoopStart) || 
-			(pChn->nPos >= pChn->nLength)) 
+			if ((pChn->nPos <= pChn->nLoopStart) ||
+			(pChn->nPos >= pChn->nLength))
 				pChn->nPos = pChn->nLength-1;
 		} else
 		{
@@ -1381,7 +1376,7 @@ static LONG MPPFASTCALL GetSampleCount(MODCHANNEL *pChn, LONG nSamples)
 			}
 			// Restart at loop start
 			pChn->nPos += nLoopStart - pChn->nLength;
-			if ((LONG)pChn->nPos < nLoopStart) 
+			if ((LONG)pChn->nPos < nLoopStart)
 				pChn->nPos = pChn->nLoopStart;
 		}
 	}
@@ -1430,7 +1425,7 @@ UINT CSoundFile_CreateStereoMix(CSoundFile *_this, int count)
 {
 	LPLONG pOfsL, pOfsR;
 	DWORD nchused, nchmixed;
-    UINT nrampsamples;
+	UINT nrampsamples;
 
 	if (!count) return 0;
 	if (_this->gnChannels > 2) X86_InitMixBuffer(_this->MixRearBuffer, count*2);
@@ -1439,13 +1434,13 @@ UINT CSoundFile_CreateStereoMix(CSoundFile *_this, int count)
 	{
 		const LPMIXINTERFACE *pMixFuncTable;
 		MODCHANNEL * const pChannel = &_this->Chn[_this->ChnMix[nChn]];
-		UINT nFlags, nMasterCh;
+		UINT nFlags;//, nMasterCh
 		LONG nSmpCount;
 		int nsamples;
 		int *pbuffer;
 
 		if (!pChannel->pCurrentSample) continue;
-		nMasterCh = (_this->ChnMix[nChn] < _this->m_nChannels) ? _this->ChnMix[nChn]+1 : pChannel->nMasterChn;
+		//nMasterCh = (_this->ChnMix[nChn] < _this->m_nChannels) ? _this->ChnMix[nChn]+1 : pChannel->nMasterChn;
 		pOfsR = &_this->gnDryROfsVol;
 		pOfsL = &_this->gnDryLOfsVol;
 		nFlags = 0;
@@ -1457,7 +1452,7 @@ UINT CSoundFile_CreateStereoMix(CSoundFile *_this, int count)
 		if (!(pChannel->dwFlags & CHN_NOIDO))
 		{
 			// use hq-fir mixer?
-			if( (_this->gdwSoundSetup & (SNDMIX_HQRESAMPLER|SNDMIX_ULTRAHQSRCMODE)) == 
+			if( (_this->gdwSoundSetup & (SNDMIX_HQRESAMPLER|SNDMIX_ULTRAHQSRCMODE)) ==
 				(SNDMIX_HQRESAMPLER|SNDMIX_ULTRAHQSRCMODE) )
 				nFlags += MIXNDX_FIRSRC;
 			else if( (_this->gdwSoundSetup & (SNDMIX_HQRESAMPLER)) == SNDMIX_HQRESAMPLER )
@@ -1619,7 +1614,7 @@ DWORD MPPASMCALL X86_Convert32To24(LPVOID lp16, int *pBuffer, DWORD lSampleCount
 	int vumin = *lpMin, vumax = *lpMax;
 	int n,p ;
 	unsigned char* buf = (unsigned char*)lp16 ;
-	
+
 	for ( i=0; i<lSampleCount; i++)
 	{
 		n = pBuffer[i];
@@ -1632,14 +1627,14 @@ DWORD MPPASMCALL X86_Convert32To24(LPVOID lp16, int *pBuffer, DWORD lSampleCount
 		else if (n > vumax)
 			vumax = n;
 		p = n >> (8-MIXING_ATTENUATION) ; // 24-bit signed
-#ifdef WORDS_BIGENDIAN
-		buf[i*3+0] = p & 0xFF0000 >> 24;
-		buf[i*3+1] = p & 0x00FF00 >> 16 ;
-		buf[i*3+2] = p & 0x0000FF ;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+		buf[i*3+0] = (p >> 16) & 0xFF;
+		buf[i*3+1] = (p >> 8)  & 0xFF;
+		buf[i*3+2] = (p >> 0)  & 0xFF;
 #else
-		buf[i*3+0] = p & 0x0000FF ;
-		buf[i*3+1] = p & 0x00FF00 >> 16;
-		buf[i*3+2] = p & 0xFF0000 >> 24;
+		buf[i*3+0] = (p >> 0)  & 0xFF;
+		buf[i*3+1] = (p >> 8)  & 0xFF;
+		buf[i*3+2] = (p >> 16) & 0xFF;
 #endif
 	}
 	*lpMin = vumin;
@@ -1654,7 +1649,7 @@ DWORD MPPASMCALL X86_Convert32To32(LPVOID lp16, int *pBuffer, DWORD lSampleCount
 	UINT i ;
 	int vumin = *lpMin, vumax = *lpMax;
 	int32_t *p = (int32_t *)lp16;
-	
+
 	for ( i=0; i<lSampleCount; i++)
 	{
 		int n = pBuffer[i];
@@ -1675,12 +1670,11 @@ DWORD MPPASMCALL X86_Convert32To32(LPVOID lp16, int *pBuffer, DWORD lSampleCount
 
 //---GCCFIX: Asm replaced with C function
 // Will fill in later.
-void MPPASMCALL X86_InitMixBuffer(int *pBuffer, UINT nSamples)
+static void MPPASMCALL X86_InitMixBuffer(int *pBuffer, UINT nSamples)
 {
 	SDL_memset(pBuffer, 0, nSamples * sizeof(int));
 }
 
-
 //---GCCFIX: Asm replaced with C function
 // Multichannel not supported.
 void MPPASMCALL X86_InterleaveFrontRear(int *pFrontBuf, int *pRearBuf, DWORD nSamples)
@@ -1727,7 +1721,7 @@ void MPPASMCALL X86_StereoFill(int *pBuffer, UINT nSamples, LPLONG lpROfs, LPLON
 
 //---GCCFIX: Asm replaced with C function
 // Will fill in later.
-void MPPASMCALL X86_EndChannelOfs(MODCHANNEL *pChannel, int *pBuffer, UINT nSamples)
+static void MPPASMCALL X86_EndChannelOfs(MODCHANNEL *pChannel, int *pBuffer, UINT nSamples)
 {
 	int rofs = pChannel->nROfs;
 	int lofs = pChannel->nLOfs;

data/dependencies/SDL_sound/libmodplug/libmodplug.h

@@ -9,36 +9,33 @@
 #ifndef _INCL_LIBMODPLUG_H_
 #define _INCL_LIBMODPLUG_H_
 
-#include "SDL.h"
-
-#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)
-#pragma GCC visibility push(hidden)
+#define __SDL_SOUND_INTERNAL__
+#include "SDL_sound_internal.h"
+
+#if defined(HAVE_LIBC) && defined(__WATCOMC__) /* Watcom has issues... */
+#define SDL_cos  cos
+#define SDL_fabs fabs
+#define SDL_log  log
+#define SDL_pow  pow
+#define SDL_sin  sin
+#define SDL_sinf sin
+#define SDL_abs  abs
 #endif
 
 #ifdef _WIN32
 
-#ifdef MSC_VER
+#ifdef _MSC_VER
 #pragma warning (disable:4201)
 #pragma warning (disable:4514)
 #endif
 
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
 #include <windows.h>
-#include <windowsx.h>
-#include <mmsystem.h>
-#include <stdio.h>
-#include <malloc.h>
-#include <stdint.h>
-
-#define srandom(_seed)  srand(_seed)
-#define random()        rand()
 
 #else
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
 typedef Sint8 CHAR;
 typedef Uint8 UCHAR;
 typedef Uint8* PUCHAR;
@@ -61,20 +58,7 @@ typedef const char* LPCSTR;
 typedef void* PVOID;
 typedef void VOID;
 
-inline LONG MulDiv (long a, long b, long c)
-{
-  // if (!c) return 0;
-  return ((uint64_t) a * (uint64_t) b ) / c;
-}
-
 #define LPCTSTR LPCSTR
-#define WAVE_FORMAT_PCM 1
-//#define ENABLE_EQ
-
-#define  GHND   0
-
-#define GlobalAllocPtr(x, size) ((int8_t *) SDL_calloc(1, (size)))
-#define GlobalFreePtr(p) SDL_free((void *)(p))
 
 #ifndef FALSE
 #define FALSE	0
@@ -86,44 +70,8 @@ inline LONG MulDiv (long a, long b, long c)
 
 #endif // _WIN32
 
-
-typedef struct {
-	char *mm;
-	int sz;
-	int pos;
-	int error;
-} MMFILE;
-
-void mmfclose(MMFILE *mmfile);
-int mmfeof(MMFILE *mmfile);
-int mmfgetc(MMFILE *mmfile);
-void mmfgets(char buf[], unsigned int bufsz, MMFILE *mmfile);
-long mmftell(MMFILE *mmfile);
-void mmfseek(MMFILE *mmfile, long p, int whence);
-BYTE mmreadUBYTE(MMFILE *mmfile);
-void mmreadUBYTES(BYTE *buf, long sz, MMFILE *mmfile);
-void mmreadSBYTES(char *buf, long sz, MMFILE *mmfile);
-char *rwops_fgets(char *buf, int buflen, SDL_RWops *rwops);
-
-#define MMSTREAM					SDL_RWops
-#define _mm_fopen(name,mode)		SDL_RWFromFile(name, mode)
-#define _mm_fgets(f,buf,sz)			rwops_fgets(buf,sz,f)
-#define _mm_fseek(f,pos,whence)		SDL_RWseek(f,pos,whence)
-#define _mm_ftell(f)				SDL_RWtell(f)
-#define _mm_read_UBYTES(buf,sz,f)	SDL_RWread(f, buf, 1, sz)
-#define _mm_read_SBYTES(buf,sz,f)	SDL_RWread(f, buf, 1, sz)
-#define _mm_feof(f)					(SDL_RWtell(f) >= SDL_RWsize(f))
-#define _mm_fclose(f)				SDL_RWclose(f)
-#define DupStr(h,buf,sz)			SDL_strdup(buf)
-#define _mm_calloc(h,n,sz)			SDL_calloc(n,sz)
-#define _mm_recalloc(h,buf,sz,elsz)	SDL_realloc(buf,sz)
-#define _mm_free(h,p)				SDL_free(p)
-
-
 #define MODPLUG_EXPORT
 
-
-
 /*
  * This source code is public domain.
  *
@@ -131,6 +79,8 @@ char *rwops_fgets(char *buf, int buflen, SDL_RWops *rwops);
  *          Adam Goode       <adam@evdebs.org> (endian and char fixes for PPC)
 */
 
+extern void init_modplug_filters(void);
+
 #ifndef LPCBYTE
 typedef const BYTE * LPCBYTE;
 #endif
@@ -153,7 +103,6 @@ typedef const BYTE * LPCBYTE;
 #define MAX_EQ_BANDS		6
 #define MAX_MIXPLUGINS		8
 
-
 #define MOD_TYPE_NONE		0x00
 #define MOD_TYPE_MOD		0x01
 #define MOD_TYPE_S3M		0x02
@@ -171,7 +120,6 @@ typedef const BYTE * LPCBYTE;
 #define MOD_TYPE_DSM		0x2000
 #define MOD_TYPE_MDL		0x4000
 #define MOD_TYPE_OKT		0x8000
-#define MOD_TYPE_MID		0x10000
 #define MOD_TYPE_DMF		0x20000
 #define MOD_TYPE_PTM		0x40000
 #define MOD_TYPE_DBM		0x80000
@@ -179,13 +127,10 @@ typedef const BYTE * LPCBYTE;
 #define MOD_TYPE_AMF0		0x200000
 #define MOD_TYPE_PSM		0x400000
 #define MOD_TYPE_J2B		0x800000
-#define MOD_TYPE_ABC		0x1000000
-#define MOD_TYPE_PAT		0x2000000
+#define MOD_TYPE_GDM		0x40000000 // Fake type
 #define MOD_TYPE_UMX		0x80000000 // Fake type
 #define MAX_MODTYPE		24
 
-
-
 // Channel flags:
 // Bits 0-7:	Sample Flags
 #define CHN_16BIT               0x01
@@ -218,7 +163,6 @@ typedef const BYTE * LPCBYTE;
 #define CHN_REVERB              0x4000000
 #define CHN_NOREVERB		0x8000000
 
-
 #define ENV_VOLUME              0x0001
 #define ENV_VOLSUSTAIN		0x0002
 #define ENV_VOLLOOP             0x0004
@@ -267,7 +211,6 @@ typedef const BYTE * LPCBYTE;
 #define CMD_SETENVPOSITION		30
 #define CMD_MIDI                        31
 
-
 // Volume Column commands
 #define VOLCMD_VOLUME			1
 #define VOLCMD_PANNING			2
@@ -438,7 +381,6 @@ enum {
 	NUM_REVERBTYPES
 };
 
-
 enum {
 	SRCMODE_NEAREST,
 	SRCMODE_LINEAR,
@@ -447,7 +389,6 @@ enum {
 	NUM_SRC_MODES
 };
 
-
 // Sample Struct
 typedef struct _MODINSTRUMENT
 {
@@ -467,7 +408,6 @@ typedef struct _MODINSTRUMENT
 	BYTE nVibRate;
 } MODINSTRUMENT;
 
-
 // Instrument Struct
 typedef struct _INSTRUMENTHEADER
 {
@@ -515,7 +455,6 @@ typedef struct _INSTRUMENTHEADER
 	CHAR filename[12];
 } INSTRUMENTHEADER;
 
-
 // Channel Struct
 typedef struct _MODCHANNEL
 {
@@ -576,7 +515,6 @@ typedef struct _MODCHANNEL
 	BYTE nActiveMacro, nPadding;
 } MODCHANNEL;
 
-
 typedef struct _MODCHANNELSETTINGS
 {
 	UINT nPan;
@@ -585,7 +523,6 @@ typedef struct _MODCHANNELSETTINGS
 	UINT nMixPlugin;
 } MODCHANNELSETTINGS;
 
-
 typedef struct _MODCOMMAND
 {
 	BYTE note;
@@ -610,7 +547,6 @@ enum {
 	MIDIOUT_PROGRAM,
 };
 
-
 typedef struct MODMIDICFG
 {
         char szMidiGlb[9*32];      // changed from CHAR
@@ -637,7 +573,7 @@ typedef struct CSoundFile
 	UINT m_nType, m_nSamples, m_nInstruments;
 	UINT m_nTickCount, m_nTotalCount, m_nPatternDelay, m_nFrameDelay;
 	UINT m_nMusicSpeed, m_nMusicTempo;
-	UINT m_nNextRow, m_nRow;
+	UINT m_nNextRow, m_nRow, m_nNextStartRow;
 	UINT m_nPattern,m_nCurrentPattern,m_nNextPattern,m_nRestartPos;
 	UINT m_nMasterVolume, m_nGlobalVolume, m_nSongPreAmp;
 	UINT m_nFreqFactor, m_nTempoFactor, m_nOldGlbVolSlide;
@@ -654,6 +590,7 @@ typedef struct CSoundFile
 	UINT m_nMaxMixChannels;
 	DWORD gdwSoundSetup, gdwMixingFreq, gnBitsPerSample, gnChannels;
 	UINT gnVolumeRampSamples;
+
     UINT gSampleSize;
     int MixSoundBuffer[MIXBUFFERSIZE*4];
     #ifndef MODPLUG_NO_REVERB
@@ -721,8 +658,8 @@ typedef struct CSoundFile
     int gbInitPlugins;
 } CSoundFile;
 
-typedef struct _ModPlug_Settings ModPlug_Settings;
-CSoundFile *new_CSoundFile(LPCBYTE lpStream, DWORD dwMemLength, const ModPlug_Settings *settings);
+struct _ModPlug_Settings;
+CSoundFile *new_CSoundFile(LPCBYTE lpStream, DWORD dwMemLength, const struct _ModPlug_Settings *settings);
 void delete_CSoundFile(CSoundFile *_this);
 
 	UINT CSoundFile_GetMaxPosition(CSoundFile *_this);
@@ -752,15 +689,8 @@ void delete_CSoundFile(CSoundFile *_this);
 	BOOL CSoundFile_ReadAMF(CSoundFile *_this, LPCBYTE lpStream, DWORD dwMemLength);
 	BOOL CSoundFile_ReadMT2(CSoundFile *_this, LPCBYTE lpStream, DWORD dwMemLength);
 	BOOL CSoundFile_ReadPSM(CSoundFile *_this, LPCBYTE lpStream, DWORD dwMemLength);
-	BOOL CSoundFile_ReadJ2B(CSoundFile *_this, LPCBYTE lpStream, DWORD dwMemLength);
+	BOOL CSoundFile_ReadGDM(CSoundFile *_this, LPCBYTE lpStream, DWORD dwMemLength);
 	BOOL CSoundFile_ReadUMX(CSoundFile *_this, LPCBYTE lpStream, DWORD dwMemLength);
-	BOOL CSoundFile_ReadABC(CSoundFile *_this, LPCBYTE lpStream, DWORD dwMemLength);
-	BOOL CSoundFile_ReadMID(CSoundFile *_this, LPCBYTE lpStream, DWORD dwMemLength);
-	BOOL CSoundFile_ReadPAT(CSoundFile *_this, LPCBYTE lpStream, DWORD dwMemLength);
-
-	BOOL CSoundFile_TestABC(LPCBYTE lpStream, DWORD dwMemLength);
-	BOOL CSoundFile_TestMID(LPCBYTE lpStream, DWORD dwMemLength);
-	BOOL CSoundFile_TestPAT(LPCBYTE lpStream, DWORD dwMemLength);
 
 	// MOD Convert function
 	void CSoundFile_ConvertModCommand(CSoundFile *_this, MODCOMMAND *);
@@ -854,9 +784,6 @@ void delete_CSoundFile(CSoundFile *_this);
 	BOOL CSoundFile_ITInstrToMPT(const void *p, INSTRUMENTHEADER *penv, UINT trkvers);
 
 	UINT CSoundFile_LoadMixPlugins(CSoundFile *_this, const void *pData, UINT nLen);
-#ifndef NO_FILTER
-	DWORD CSoundFile_CutOffToFrequency(CSoundFile *_this, UINT nCutOff, int flt_modifier); // [0-255] => [1-10KHz]
-#endif
 
 	DWORD CSoundFile_TransposeToFrequency(int transp, int ftune);
 	int CSoundFile_FrequencyToTranspose(DWORD freq);
@@ -869,7 +796,6 @@ void delete_CSoundFile(CSoundFile *_this);
 	UINT CSoundFile_Normalize24BitBuffer(LPBYTE pbuffer, UINT cbsizebytes, DWORD lmax24, DWORD dwByteInc);
 
 
-
 #pragma pack(1)
 
 typedef struct tagITFILEHEADER
@@ -898,7 +824,6 @@ typedef struct tagITFILEHEADER
 	BYTE chnvol[64];
 } ITFILEHEADER;
 
-
 typedef struct tagITENVELOPE
 {
 	BYTE flags;
@@ -929,13 +854,13 @@ typedef struct tagITOLDINSTRUMENT
 	WORD trkvers;
 	BYTE nos;
 	BYTE reserved2;
+	CHAR name[26];
 	WORD reserved3[3];
 	BYTE keyboard[240];
 	BYTE volenv[200];
 	BYTE nodes[50];
 } ITOLDINSTRUMENT;
 
-
 // Impulse Instrument Format
 typedef struct tagITINSTRUMENT
 {
@@ -955,6 +880,7 @@ typedef struct tagITINSTRUMENT
 	WORD trkvers;
 	BYTE nos;
 	BYTE reserved1;
+	CHAR name[26];
 	BYTE ifc;
 	BYTE ifr;
 	BYTE mch;
@@ -967,7 +893,6 @@ typedef struct tagITINSTRUMENT
 	BYTE dummy[4]; // was 7, but IT v2.17 saves 554 bytes
 } ITINSTRUMENT;
 
-
 // IT Sample Format
 typedef struct ITSAMPLESTRUCT
 {
@@ -977,6 +902,7 @@ typedef struct ITSAMPLESTRUCT
 	BYTE gvl;
 	BYTE flags;
 	BYTE vol;
+	CHAR name[26];
 	BYTE cvt;
 	BYTE dfp;
 	DWORD length;
@@ -994,8 +920,4 @@ typedef struct ITSAMPLESTRUCT
 
 #pragma pack()
 
-extern BYTE autovibit2xm[8];
-extern BYTE autovibxm2it[8];
-
 #endif
-