gosu 1.3.0 → 1.4.3

data/dependencies/SDL_sound/libmodplug/modplug.c

@@ -7,13 +7,13 @@
 #include "modplug.h"
 #include "libmodplug.h"
 
-void ModPlug_Quit(void) { /* does nothing. */ }
-
+void ModPlug_Quit(void) {
+}
 int ModPlug_Init(void)
 {
-    extern void init_modplug_filters(void);
-    init_modplug_filters();
-    return 1;
+	init_modplug_filters();
+	SDL_srand(SDL_GetPerformanceCounter());
+	return 1;
 }
 
 ModPlugFile* ModPlug_Load(const void* data, int size, const ModPlug_Settings *settings)
@@ -28,7 +28,7 @@ void ModPlug_Unload(ModPlugFile* file)
 
 int ModPlug_Read(ModPlugFile* file, void* buffer, int size)
 {
-    CSoundFile *sndfile = (CSoundFile *) file;
+	CSoundFile *sndfile = (CSoundFile *) file;
 	return CSoundFile_Read(sndfile, buffer, size) * sndfile->gSampleSize;
 }
 
@@ -47,124 +47,8 @@ void ModPlug_Seek(ModPlugFile* file, int millisecond)
 		millisecond = maxtime;
 	maxpos = CSoundFile_GetMaxPosition((CSoundFile *) file);
 	postime = 0.0f;
-	if (maxtime != 0.0f)
+	if (maxtime != 0)
 		postime = (float)maxpos / (float)maxtime;
 
 	CSoundFile_SetCurrentPos((CSoundFile *) file, (int)(millisecond * postime));
 }
-
-// inefficient, but oh well.
-char *rwops_fgets(char *buf, int buflen, SDL_RWops *rwops)
-{
-    char *retval = buf;
-    if (!buflen) return buf;
-    while (buflen > 1) {
-        char ch;
-        if (SDL_RWread(rwops, &ch, 1, 1) != 1) {
-            break;
-        }
-        *(buf++) = ch;
-        buflen--;
-        if (ch == '\n') {
-            break;
-        }
-    }
-    *(buf) = '\0';
-    return retval;
-}
-
-long mmftell(MMFILE *mmfile)
-{
-	return mmfile->pos;
-}
-
-void mmfseek(MMFILE *mmfile, long p, int whence)
-{
-	int newpos = mmfile->pos;
-	switch(whence) {
-		case SEEK_SET:
-			newpos = p;
-			break;
-		case SEEK_CUR:
-			newpos += p;
-			break;
-		case SEEK_END:
-			newpos = mmfile->sz + p;
-			break;
-	}
-	if (newpos < mmfile->sz)
-		mmfile->pos = newpos;
-	else {
-		mmfile->error = 1;
-//		printf("WARNING: seeking too far\n");
-	}
-}
-
-void mmreadUBYTES(BYTE *buf, long sz, MMFILE *mmfile)
-{
-	int sztr = sz;
-	// do not overread.
-	if (sz > mmfile->sz - mmfile->pos)
-		sztr = mmfile->sz - mmfile->pos;
-	SDL_memcpy(buf, &mmfile->mm[mmfile->pos], sztr);
-	mmfile->pos += sz;
-	// if truncated read, populate the rest of the array with zeros.
-	if (sz > sztr)
-		SDL_memset(buf+sztr, 0, sz-sztr);
-}
-
-void mmreadSBYTES(char *buf, long sz, MMFILE *mmfile)
-{
-	// do not overread.
-	if (sz > mmfile->sz - mmfile->pos)
-		sz = mmfile->sz - mmfile->pos;
-	SDL_memcpy(buf, &mmfile->mm[mmfile->pos], sz);
-	mmfile->pos += sz;
-}
-
-BYTE mmreadUBYTE(MMFILE *mmfile)
-{
-	BYTE b;
-	b = (BYTE)mmfile->mm[mmfile->pos];
-	mmfile->pos++;
-	return b;
-}
-
-void mmfclose(MMFILE *mmfile)
-{
-	SDL_free(mmfile);
-}
-
-int mmfeof(MMFILE *mmfile)
-{
-	if( mmfile->pos < 0 ) return TRUE;
-	if( mmfile->pos < mmfile->sz ) return FALSE;
-	return TRUE;
-}
-
-int mmfgetc(MMFILE *mmfile)
-{
-	int b = EOF;
-	if( mmfeof(mmfile) ) return EOF;
-	b = mmfile->mm[mmfile->pos];
-	mmfile->pos++;
-	if( b=='\r' && !mmfeof(mmfile) && mmfile->mm[mmfile->pos] == '\n' ) {
-		b = '\n';
-		mmfile->pos++;
-	}
-	return b;
-}
-
-void mmfgets(char buf[], unsigned int bufsz, MMFILE *mmfile)
-{
-	int i = 0;
-    int b;
-	for( i=0; i<(int)bufsz-1; i++ ) {
-		b = mmfgetc(mmfile);
-		if( b==EOF ) break;
-		buf[i] = b;
-		if( b == '\n' ) break;
-	}
-	buf[i] = '\0';
-}
-

data/dependencies/SDL_sound/libmodplug/modplug.h

@@ -16,6 +16,35 @@ extern "C" {
 struct _ModPlugFile;
 typedef struct _ModPlugFile ModPlugFile;
 
+/* [de]initialize the library */
+int  ModPlug_Init(void);
+void ModPlug_Quit(void);
+
+struct _ModPlug_Settings;
+
+/* Load a mod file.  [data] should point to a block of memory containing the complete
+ * file, and [size] should be the size of that block.
+ * Return the loaded mod file on success, or NULL on failure. */
+MODPLUG_EXPORT ModPlugFile* ModPlug_Load(const void* data, int size, const struct _ModPlug_Settings *settings);
+/* Unload a mod file. */
+MODPLUG_EXPORT void ModPlug_Unload(ModPlugFile* file);
+
+/* Read sample data into the buffer.  Returns the number of bytes read.  If the end
+ * of the mod has been reached, zero is returned. */
+MODPLUG_EXPORT int  ModPlug_Read(ModPlugFile* file, void* buffer, int size);
+
+/* Get the length of the mod, in milliseconds.  Note that this result is not always
+ * accurate, especially in the case of mods with loops. */
+MODPLUG_EXPORT int ModPlug_GetLength(ModPlugFile* file);
+
+/* Seek to a particular position in the song.  Note that seeking and MODs don't mix very
+ * well.  Some mods will be missing instruments for a short time after a seek, as ModPlug
+ * does not scan the sequence backwards to find out which instruments were supposed to be
+ * playing at that time.  (Doing so would be difficult and not very reliable.)  Also,
+ * note that seeking is not very exact in some mods -- especially those for which
+ * ModPlug_GetLength() does not report the full length. */
+MODPLUG_EXPORT void ModPlug_Seek(ModPlugFile* file, int millisecond);
+
 enum _ModPlug_Flags
 {
 	MODPLUG_ENABLE_OVERSAMPLING     = 1 << 0,  /* Enable oversampling (*highly* recommended) */
@@ -36,7 +65,7 @@ enum _ModPlug_ResamplingMode
 typedef struct _ModPlug_Settings
 {
 	int mFlags;  /* One or more of the MODPLUG_ENABLE_* flags above, bitwise-OR'ed */
-	
+
 	/* Note that ModPlug always decodes sound at 44100kHz, 32 bit, stereo and then
 	 * down-mixes to the settings you choose. */
 	int mChannels;       /* Number of channels - 1 for mono or 2 for stereo */
@@ -46,7 +75,7 @@ typedef struct _ModPlug_Settings
 
 	int mStereoSeparation; /* Stereo separation, 1 - 256 */
 	int mMaxMixChannels; /* Maximum number of mixing channels (polyphony), 32 - 256 */
-	
+
 	int mReverbDepth;    /* Reverb level 0(quiet)-100(loud)      */
 	int mReverbDelay;    /* Reverb delay in ms, usually 40-200ms */
 	int mBassAmount;     /* XBass level 0(quiet)-100(loud)       */
@@ -54,35 +83,9 @@ typedef struct _ModPlug_Settings
 	int mSurroundDepth;  /* Surround level 0(quiet)-100(heavy)   */
 	int mSurroundDelay;  /* Surround delay in ms, usually 5-40ms */
 	int mLoopCount;      /* Number of times to loop.  Zero prevents looping.
-	                        -1 loops forever. */
+			      * -1 loops forever. */
 } ModPlug_Settings;
 
-int ModPlug_Init(void);
-void ModPlug_Quit(void);
-
-/* Load a mod file.  [data] should point to a block of memory containing the complete
- * file, and [size] should be the size of that block.
- * Return the loaded mod file on success, or NULL on failure. */
-MODPLUG_EXPORT ModPlugFile* ModPlug_Load(const void* data, int size, const ModPlug_Settings *settings);
-/* Unload a mod file. */
-MODPLUG_EXPORT void ModPlug_Unload(ModPlugFile* file);
-
-/* Read sample data into the buffer.  Returns the number of bytes read.  If the end
- * of the mod has been reached, zero is returned. */
-MODPLUG_EXPORT int  ModPlug_Read(ModPlugFile* file, void* buffer, int size);
-
-/* Get the length of the mod, in milliseconds.  Note that this result is not always
- * accurate, especially in the case of mods with loops. */
-MODPLUG_EXPORT int ModPlug_GetLength(ModPlugFile* file);
-
-/* Seek to a particular position in the song.  Note that seeking and MODs don't mix very
- * well.  Some mods will be missing instruments for a short time after a seek, as ModPlug
- * does not scan the sequence backwards to find out which instruments were supposed to be
- * playing at that time.  (Doing so would be difficult and not very reliable.)  Also,
- * note that seeking is not very exact in some mods -- especially those for which
- * ModPlug_GetLength() does not report the full length. */
-MODPLUG_EXPORT void ModPlug_Seek(ModPlugFile* file, int millisecond);
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

data/dependencies/SDL_sound/libmodplug/snd_dsp.c

@@ -298,4 +298,3 @@ BOOL CSoundFile_SetWaveConfigEx(CSoundFile *_this, BOOL bSurround,BOOL bNoOverSa
 	CSoundFile_InitPlayer(_this, FALSE);
 	return TRUE;
 }
-

data/dependencies/SDL_sound/libmodplug/snd_flt.c

@@ -12,7 +12,7 @@
 
 #ifndef NO_FILTER
 
-DWORD CSoundFile_CutOffToFrequency(CSoundFile *_this, UINT nCutOff, int flt_modifier)
+static DWORD CutOffToFrequency(CSoundFile *_this, UINT nCutOff, int flt_modifier)
 //-----------------------------------------------------------------------
 {
 	float Fc;
@@ -33,7 +33,7 @@ DWORD CSoundFile_CutOffToFrequency(CSoundFile *_this, UINT nCutOff, int flt_modi
 void CSoundFile_SetupChannelFilter(CSoundFile *_this, MODCHANNEL *pChn, BOOL bReset, int flt_modifier)
 //----------------------------------------------------------------------------------------
 {
-	float fc = (float)CSoundFile_CutOffToFrequency(_this, pChn->nCutOff, flt_modifier);
+	float fc = (float)CutOffToFrequency(_this, pChn->nCutOff, flt_modifier);
 	float fs = (float)_this->gdwMixingFreq;
 	float fg, fb0, fb1;
 

data/dependencies/SDL_sound/libmodplug/snd_fx.c

@@ -5,7 +5,7 @@
 */
 
 #include "libmodplug.h"
-#include <stdlib.h>
+#define SNDFX_C
 #include "tables.h"
 
 DWORD CSoundFile_GetLength(CSoundFile *_this, BOOL bAdjust, BOOL bTotal)
@@ -13,9 +13,8 @@ DWORD CSoundFile_GetLength(CSoundFile *_this, BOOL bAdjust, BOOL bTotal)
 {
 	UINT dwElapsedTime=0, nRow=0, nCurrentPattern=0, nNextPattern=0, nPattern=0;
 	UINT nMusicSpeed=_this->m_nDefaultSpeed, nMusicTempo=_this->m_nDefaultTempo, nNextRow=0;
-	UINT nMaxRow = 0, nMaxPattern = 0;
+	UINT nMaxRow = 0, nMaxPattern = 0, nNextStartRow = 0;
 	LONG nGlbVol = _this->m_nDefaultGlobalVolume, nOldGlbVolSlide = 0;
-	BYTE samples[MAX_CHANNELS];
 	BYTE instr[MAX_CHANNELS];
 	BYTE notes[MAX_CHANNELS];
 	BYTE vols[MAX_CHANNELS];
@@ -29,7 +28,6 @@ DWORD CSoundFile_GetLength(CSoundFile *_this, BOOL bAdjust, BOOL bTotal)
 	SDL_memset(patloop, 0, sizeof(patloop));
 	SDL_memset(oldparam, 0, sizeof(oldparam));
 	SDL_memset(chnvols, 64, sizeof(chnvols));
-	SDL_memset(samples, 0, sizeof(samples));
 	for (UINT icv=0; icv<_this->m_nChannels; icv++)
 		chnvols[icv] = _this->ChnSettings[icv].nVolume;
 	nMaxRow = _this->m_nNextRow;
@@ -40,7 +38,7 @@ DWORD CSoundFile_GetLength(CSoundFile *_this, BOOL bAdjust, BOOL bTotal)
 		nRow = nNextRow;
 		nCurrentPattern = nNextPattern;
 		// Check if pattern is valid
-		nPattern = _this->Order[nCurrentPattern];
+		nPattern = (nCurrentPattern < MAX_ORDERS) ? _this->Order[nCurrentPattern] : 0xFF;
 		while (nPattern >= MAX_PATTERNS)
 		{
 			// End of song ?
@@ -55,7 +53,8 @@ DWORD CSoundFile_GetLength(CSoundFile *_this, BOOL bAdjust, BOOL bTotal)
 			nNextPattern = nCurrentPattern;
 		}
 		// Weird stuff?
-		if ((nPattern >= MAX_PATTERNS) || (!_this->Patterns[nPattern])) break;
+		if ((nPattern >= MAX_PATTERNS) || (!_this->Patterns[nPattern]) ||
+			_this->PatternSize[nPattern] == 0) break;
 		// Should never happen
 		if (nRow >= _this->PatternSize[nPattern]) nRow = 0;
 		// Update next position
@@ -63,7 +62,8 @@ DWORD CSoundFile_GetLength(CSoundFile *_this, BOOL bAdjust, BOOL bTotal)
 		if (nNextRow >= _this->PatternSize[nPattern])
 		{
 			nNextPattern = nCurrentPattern + 1;
-			nNextRow = 0;
+			nNextRow = nNextStartRow;
+			nNextStartRow = 0;
 		}
 		if (!nRow)
 		{
@@ -98,6 +98,7 @@ DWORD CSoundFile_GetLength(CSoundFile *_this, BOOL bAdjust, BOOL bTotal)
 				if (param <= nCurrentPattern) goto EndMod;
 				nNextPattern = param;
 				nNextRow = 0;
+				nNextStartRow = 0;
 				if (bAdjust)
 				{
 					pChn->nPatternLoopCount = 0;
@@ -108,6 +109,7 @@ DWORD CSoundFile_GetLength(CSoundFile *_this, BOOL bAdjust, BOOL bTotal)
 			case CMD_PATTERNBREAK:
 				nNextRow = param;
 				nNextPattern = nCurrentPattern + 1;
+				nNextStartRow = 0;
 				if (bAdjust)
 				{
 					pChn->nPatternLoopCount = 0;
@@ -149,7 +151,10 @@ DWORD CSoundFile_GetLength(CSoundFile *_this, BOOL bAdjust, BOOL bTotal)
 				if ((param & 0xF0) == 0x60)
 				{
 					if (param & 0x0F) dwElapsedTime += (dwElapsedTime - patloop[nChn]) * (param & 0x0F);
-					else patloop[nChn] = dwElapsedTime;
+					else {
+						patloop[nChn] = dwElapsedTime;
+						if (_this->m_nType & MOD_TYPE_XM) nNextStartRow = nRow;
+					}
 				}
 				break;
 			}
@@ -415,7 +420,14 @@ void CSoundFile_NoteChange(CSoundFile *_this, UINT nChn, int note, BOOL bPorta,
 	if (note >= 0x80)	// 0xFE or invalid note => key off
 	{
 		// Key Off
-		CSoundFile_KeyOff(_this, nChn);
+		if (note < 0xFD && _this->m_nType == MOD_TYPE_IT)
+		{
+			if (_this->m_nInstruments)
+				pChn->dwFlags |= CHN_NOTEFADE;
+		} else
+		{
+			CSoundFile_KeyOff(_this, nChn);
+		}
 		// Note Cut
 		if (note == 0xFE)
 		{
@@ -515,13 +527,13 @@ void CSoundFile_NoteChange(CSoundFile *_this, UINT nChn, int note, BOOL bPorta,
 					// Volume Swing
 					if (penv->nVolSwing)
 					{
-						int d = ((LONG)penv->nVolSwing*(LONG)((rand() & 0xFF) - 0x7F)) / 128;
+						int d = ((LONG)penv->nVolSwing*(LONG)((SDL_rand() & 0xFF) - 0x7F)) / 128;
 						pChn->nVolSwing = (signed short)((d * pChn->nVolume + 1)/128);
 					}
 					// Pan Swing
 					if (penv->nPanSwing)
 					{
-						int d = ((LONG)penv->nPanSwing*(LONG)((rand() & 0xFF) - 0x7F)) / 128;
+						int d = ((LONG)penv->nPanSwing*(LONG)((SDL_rand() & 0xFF) - 0x7F)) / 128;
 						pChn->nPanSwing = (signed short)d;
 					}
 				}
@@ -686,7 +698,7 @@ void CSoundFile_CheckNNA(CSoundFile *_this, UINT nChn, UINT instr, int note, BOO
 		UINT n = CSoundFile_GetNNAChannel(_this, nChn);
 		if (n)
 		{
-			MODCHANNEL *p = &_this->Chn[n];
+			p = &_this->Chn[n];
 			// Copy Channel
 			SDL_memcpy(p, pChn, sizeof (*p));
 			p->dwFlags &= ~(CHN_VIBRATO|CHN_TREMOLO|CHN_PANBRELLO|CHN_MUTE|CHN_PORTAMENTO);
@@ -1159,11 +1171,13 @@ BOOL CSoundFile_ProcessEffects(CSoundFile *_this)
 		// Position Jump
 		case CMD_POSITIONJUMP:
 			nPosJump = param;
+			_this->m_nNextStartRow = 0;
 			break;
 
 		// Pattern Break
 		case CMD_PATTERNBREAK:
 			nBreakRow = param;
+			_this->m_nNextStartRow = 0;
 			break;
 
 		// Midi Controller
@@ -1205,9 +1219,6 @@ BOOL CSoundFile_ProcessEffects(CSoundFile *_this)
 						if (_this->m_nRepeatCount > 0) _this->m_nRepeatCount--;
 					} else
 					{
-					#ifdef MODPLUG_TRACKER
-						if (_this->gdwSoundSetup & SNDMIX_NOBACKWARDJUMPS)
-					#endif
 						// Backward jump disabled
 						bNoLoop = TRUE;
 						//reset repeat count incase there are multiple loops.
@@ -2039,8 +2050,6 @@ void CSoundFile_SetSpeed(CSoundFile *_this, UINT param)
 //-----------------------------------
 {
 	UINT max = (_this->m_nType == MOD_TYPE_IT) ? 256 : 128;
-	// Modplug Tracker and Mod-Plugin don't do this check
-#ifndef MODPLUG_TRACKER
 	// Big Hack!!!
 	if ((!param) || (param >= 0x80) || ((_this->m_nType & (MOD_TYPE_MOD|MOD_TYPE_XM|MOD_TYPE_MT2)) && (param >= 0x1E)))
 	{
@@ -2049,7 +2058,6 @@ void CSoundFile_SetSpeed(CSoundFile *_this, UINT param)
 			CSoundFile_GlobalFadeSong(_this, 1000);
 		}
 	}
-#endif // MODPLUG_TRACKER
 	if ((_this->m_nType & MOD_TYPE_S3M) && (param > 0x80)) param -= 0x80;
 	if ((param) && (param <= max)) _this->m_nMusicSpeed = param;
 }
@@ -2100,6 +2108,7 @@ int CSoundFile_PatternLoop(CSoundFile *_this, MODCHANNEL *pChn, UINT param)
 	} else
 	{
 		pChn->nPatternLoop = _this->m_nRow;
+		if (_this->m_nType & MOD_TYPE_XM) _this->m_nNextStartRow = _this->m_nRow;
 	}
 	return -1;
 }
@@ -2271,8 +2280,12 @@ UINT CSoundFile_GetPeriodFromNote(CSoundFile *_this, UINT note, int nFineTune, U
 			return (FreqS3MTable[note % 12] << 5) >> (note / 12);
 		} else
 		{
+			int divider;
 			if (!nC4Speed) nC4Speed = 8363;
-			return _muldiv(8363, (FreqS3MTable[note % 12] << 5), nC4Speed << (note / 12));
+			// if C4Speed is large, then up shifting may produce a zero divider
+			divider = nC4Speed << (note / 12);
+			if (!divider) divider = 1e6;
+			return _muldiv(8363, (FreqS3MTable[note % 12] << 5), divider);
 		}
 	} else
 	if (_this->m_nType & (MOD_TYPE_XM|MOD_TYPE_MT2))