X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_mem.c;h=d0671eb8740fb88ef143148178beb8500933442f;hp=c620d23664392e2f530a2922f0b4545b1984ed21;hb=1e1dbc1c5b89ae4ab8cdd9b32dc6413c67f5dd84;hpb=210a1ae668bc1a39a2e667a4f96eff008dad6b93

diff --git a/snd_mem.c b/snd_mem.c
index c620d236..d0671eb8 100644
--- a/snd_mem.c
+++ b/snd_mem.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-#include "ogg.h"
+#include "snd_ogg.h"
 
 
 /*
@@ -56,7 +56,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
 				((signed char *)sc->data)[i] = ((unsigned char *)data)[i] - 128;
 		else //if (sc->width == 2) // 16bit
 			for (i = 0;i < srclength;i++)
-				((short *)sc->data)[i] = LittleShort (((short *)data)[i]);
+				((short *)sc->data)[i] = ((short *)data)[i];
 	}
 	else
 	{
@@ -74,8 +74,8 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
 					fracstep <<= 1;
 					for (i=0 ; i<outcount ; i++)
 					{
-						*out++ = LittleShort (in[srcsample  ]);
-						*out++ = LittleShort (in[srcsample+1]);
+						*out++ = in[srcsample  ];
+						*out++ = in[srcsample+1];
 						srcsample += fracstep;
 					}
 				}
@@ -83,7 +83,7 @@ void ResampleSfx (sfxcache_t *sc, qbyte *data, char *name)
 				{
 					for (i=0 ; i<outcount ; i++)
 					{
-						*out++ = LittleShort (in[srcsample  ]);
+						*out++ = in[srcsample];
 						srcsample += fracstep;
 					}
 				}
@@ -221,7 +221,7 @@ sfxcache_t *S_LoadWavFile (const char *filename, sfx_t *s)
 	sfxcache_t *sc;
 
 	// Load the file
-	data = FS_LoadFile(filename, false);
+	data = FS_LoadFile(filename, tempmempool, false);
 	if (!data)
 		return NULL;
 
@@ -259,6 +259,21 @@ sfxcache_t *S_LoadWavFile (const char *filename, sfx_t *s)
 	sc->width = info.width;
 	sc->stereo = info.channels == 2;
 
+#if BYTE_ORDER != LITTLE_ENDIAN
+	// We must convert the WAV data from little endian
+	// to the machine endianess before resampling it
+	if (info.width == 2)
+	{
+		int i;
+		short* ptr;
+
+		len = info.samples * info.channels;
+		ptr = (short*)(data + info.dataofs);
+		for (i = 0; i < len; i++)
+			ptr[i] = LittleShort (ptr[i]);
+	}
+#endif
+
 	ResampleSfx(sc, data + info.dataofs, s->name);
 
 	Mem_Free(data);
@@ -312,7 +327,7 @@ sfxcache_t *S_LoadSound (sfx_t *s, int complain)
 	{
 		if (modified_name)
 			strcpy (namebuffer + len - 3, "wav");
-		Con_Printf ("Couldn't load %s\n", namebuffer);
+		Con_Printf("Couldn't load %s\n", namebuffer);
 	}
 	return NULL;
 }
@@ -336,30 +351,30 @@ WAV loading
 */
 
 
-qbyte *data_p;
-qbyte *iff_end;
-qbyte *last_chunk;
-qbyte *iff_data;
-int iff_chunk_len;
+static qbyte *data_p;
+static qbyte *iff_end;
+static qbyte *last_chunk;
+static qbyte *iff_data;
+static int iff_chunk_len;
 
 
 short GetLittleShort(void)
 {
-	short val = 0;
-	val = *data_p;
-	val = val + (*(data_p+1)<<8);
+	short val;
+
+	val = BuffLittleShort (data_p);
 	data_p += 2;
+
 	return val;
 }
 
 int GetLittleLong(void)
 {
 	int val = 0;
-	val = *data_p;
-	val = val + (*(data_p+1)<<8);
-	val = val + (*(data_p+2)<<16);
-	val = val + (*(data_p+3)<<24);
+
+	val = BuffLittleLong (data_p);
 	data_p += 4;
+
 	return val;
 }
 
@@ -407,7 +422,7 @@ void DumpChunks(void)
 		memcpy (str, data_p, 4);
 		data_p += 4;
 		iff_chunk_len = GetLittleLong();
-		Con_Printf ("0x%x : %s (%d)\n", (int)(data_p - 4), str, iff_chunk_len);
+		Con_Printf("0x%x : %s (%d)\n", (int)(data_p - 4), str, iff_chunk_len);
 		data_p += (iff_chunk_len + 1) & ~1;
 	} while (data_p < iff_end);
 }
@@ -436,7 +451,7 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
 	FindChunk("RIFF");
 	if (!(data_p && !strncmp(data_p+8, "WAVE", 4)))
 	{
-		Con_Printf("Missing RIFF/WAVE chunks\n");
+		Con_Print("Missing RIFF/WAVE chunks\n");
 		return info;
 	}
 
@@ -447,14 +462,14 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
 	FindChunk("fmt ");
 	if (!data_p)
 	{
-		Con_Printf("Missing fmt chunk\n");
+		Con_Print("Missing fmt chunk\n");
 		return info;
 	}
 	data_p += 8;
 	format = GetLittleShort();
 	if (format != 1)
 	{
-		Con_Printf("Microsoft PCM format only\n");
+		Con_Print("Microsoft PCM format only\n");
 		return info;
 	}
 
@@ -489,7 +504,7 @@ wavinfo_t GetWavinfo (char *name, qbyte *wav, int wavlength)
 	FindChunk("data");
 	if (!data_p)
 	{
-		Con_Printf("Missing data chunk\n");
+		Con_Print("Missing data chunk\n");
 		return info;
 	}