From: lordhavoc <lordhavoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 21 Sep 2000 01:47:36 +0000 (+0000)
Subject: ResampleSfx clean up and a bug fix on resampled stereo
X-Git-Tag: RELEASE_0_2_0_RC1~983
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=bfe723bb408d3191a0b3270b8ce67468cb483d2f

ResampleSfx clean up and a bug fix on resampled stereo


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@37 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/snd_mem.c b/snd_mem.c
index be03af6a..ca7fb36b 100644
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -36,7 +36,7 @@ void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
 	int		srcsample;
 	float	stepscale;
 	int		i;
-	int		sample, samplefrac, fracstep;
+	int		samplefrac, fracstep;
 	sfxcache_t	*sc;
 	
 	sc = Cache_Check (&sfx->cache);
@@ -96,46 +96,48 @@ void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
 		fracstep = stepscale*256;
 		if (sc->stereo) // LordHavoc: stereo sound support
 		{
-			for (i=0 ; i<outcount ; i+=2)
+			if (sc->width == 2)
 			{
-				srcsample = samplefrac >> 8;
-				samplefrac += fracstep;
-				srcsample <<= 1;
-				// left
-				if (inwidth == 2)
-					sample = LittleShort ( ((short *)data)[srcsample] );
-				else
-					sample = (int)( (unsigned char)(data[srcsample]) - 128) << 8;
-				if (sc->width == 2)
-					((short *)sc->data)[i] = sample;
-				else
-					((signed char *)sc->data)[i] = sample >> 8;
-				// right
-				srcsample++;
-				if (inwidth == 2)
-					sample = LittleShort ( ((short *)data)[srcsample] );
-				else
-					sample = (int)( (unsigned char)(data[srcsample]) - 128) << 8;
-				if (sc->width == 2)
-					((short *)sc->data)[i+1] = sample;
-				else
-					((signed char *)sc->data)[i+1] = sample >> 8;
+				for (i=0 ; i<outcount*2 ;)
+				{
+					srcsample = samplefrac >> 8;
+					samplefrac += fracstep;
+					srcsample <<= 1;
+					((short *)sc->data)[i++] = LittleShort ( ((short *)data)[srcsample++] ); // left
+					((short *)sc->data)[i++] = LittleShort ( ((short *)data)[srcsample  ] ); // right
+				}
+			}
+			else
+			{
+				for (i=0 ; i<outcount*2 ;)
+				{
+					srcsample = samplefrac >> 8;
+					samplefrac += fracstep;
+					srcsample <<= 1;
+					((signed char *)sc->data)[i++] = ((int)( (unsigned char)(data[srcsample++]) - 128) << 8) >> 8; // left
+					((signed char *)sc->data)[i++] = ((int)( (unsigned char)(data[srcsample  ]) - 128) << 8) >> 8; // right
+				}
 			}
 		}
 		else
 		{
-			for (i=0 ; i<outcount ; i++)
+			if (sc->width == 2)
+			{
+				for (i=0 ; i<outcount ; i++)
+				{
+					srcsample = samplefrac >> 8;
+					samplefrac += fracstep;
+					((short *)sc->data)[i] = LittleShort ( ((short *)data)[srcsample] );
+				}
+			}
+			else
 			{
-				srcsample = samplefrac >> 8;
-				samplefrac += fracstep;
-				if (inwidth == 2)
-					sample = LittleShort ( ((short *)data)[srcsample] );
-				else
-					sample = (int)( (unsigned char)(data[srcsample]) - 128) << 8;
-				if (sc->width == 2)
-					((short *)sc->data)[i] = sample;
-				else
-					((signed char *)sc->data)[i] = sample >> 8;
+				for (i=0 ; i<outcount ; i++)
+				{
+					srcsample = samplefrac >> 8;
+					samplefrac += fracstep;
+					((signed char *)sc->data)[i] = ((int)( (unsigned char)(data[srcsample]) - 128) << 8) >> 8;
+				}
 			}
 		}
 	}