X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=snd_oss.c;h=516072785145df17062012324986a8185c1f1e7f;hb=e704ef9206641ea061bbedfcff48a929734371e8;hp=14fe64efbdfba7a39e2e1e33283724b0e0627c97;hpb=75ed3f5912a36f85ba78cae4e98e54e19c098686;p=xonotic%2Fdarkplaces.git

diff --git a/snd_oss.c b/snd_oss.c
index 14fe64ef..51607278 100644
--- a/snd_oss.c
+++ b/snd_oss.c
@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 int audio_fd;
 int snd_inited;
 
-static int tryrates[] = { 11025, 22051, 44100, 8000 };
+static int tryrates[] = {44100, 22051, 11025, 8000};
 
 qboolean SNDDMA_Init(void)
 {
@@ -43,6 +43,19 @@ qboolean SNDDMA_Init(void)
 	char *s;
 	struct audio_buf_info info;
 	int caps;
+	int format16bit;
+	// LordHavoc: a quick patch to support big endian cpu, I hope
+	union
+	{
+		unsigned char c[2];
+		unsigned short s;
+	}
+	endiantest;
+	endiantest.s = 1;
+	if (endiantest.c[1])
+		format16bit = AFMT_S16_BE;
+	else
+		format16bit = AFMT_S16_LE;
 
 	snd_inited = 0;
 
@@ -55,8 +68,7 @@ qboolean SNDDMA_Init(void)
 		return 0;
 	}
 
-	rc = ioctl(audio_fd, SNDCTL_DSP_RESET, 0);
-	if (rc < 0)
+	if (ioctl(audio_fd, SNDCTL_DSP_RESET, 0) < 0)
 	{
 		perror("/dev/dsp");
 		Con_Printf("Could not reset /dev/dsp\n");
@@ -80,15 +92,12 @@ qboolean SNDDMA_Init(void)
 	}
 
 	if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info)==-1)
-	{   
+	{
 		perror("GETOSPACE");
 		Con_Printf("Um, can't do GETOSPACE?\n");
 		close(audio_fd);
 		return 0;
 	}
-    
-	shm = &sn;
-	shm->splitbuffer = 0;
 
 	// set sample bits & speed
 	s = getenv("QUAKE_SOUND_SAMPLEBITS");
@@ -100,7 +109,7 @@ qboolean SNDDMA_Init(void)
 	if (shm->samplebits != 16 && shm->samplebits != 8)
 	{
 		ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt);
-		if (fmt & AFMT_S16_LE)
+		if (fmt & format16bit)
 			shm->samplebits = 16;
 		else if (fmt & AFMT_U8)
 			shm->samplebits = 8;
@@ -113,10 +122,9 @@ qboolean SNDDMA_Init(void)
 		shm->speed = atoi(com_argv[i+1]);
 	else
 	{
-		for (i=0 ; i<sizeof(tryrates)/4 ; i++) {
+		for (i = 0;i < (int) sizeof(tryrates) / 4;i++)
 			if (!ioctl(audio_fd, SNDCTL_DSP_SPEED, &tryrates[i]))
 				break;
-		}
 
 		shm->speed = tryrates[i];
     }
@@ -132,11 +140,10 @@ qboolean SNDDMA_Init(void)
 		shm->channels = 2;
 
 	shm->samples = info.fragstotal * info.fragsize / (shm->samplebits/8);
-	shm->submission_chunk = 1;
 
 	// memory map the dma buffer
-	shm->buffer = (unsigned char *) mmap(NULL, info.fragstotal
-		* info.fragsize, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
+	shm->bufferlength = info.fragstotal * info.fragsize;
+	shm->buffer = (unsigned char *) mmap(NULL, shm->bufferlength, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
 	if (!shm->buffer || shm->buffer == (unsigned char *)-1)
 	{
 		perror("/dev/dsp");
@@ -173,7 +180,7 @@ qboolean SNDDMA_Init(void)
 
 	if (shm->samplebits == 16)
 	{
-		rc = AFMT_S16_LE;
+		rc = format16bit;
 		rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc);
 		if (rc < 0)
 		{
@@ -251,9 +258,18 @@ int SNDDMA_GetDMAPos(void)
 
 void SNDDMA_Shutdown(void)
 {
+	int tmp;
 	if (snd_inited)
 	{
+		// unmap the memory
+		munmap(shm->buffer, shm->bufferlength);
+		// stop the sound
+		tmp = 0;
+		ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
+		ioctl(audio_fd, SNDCTL_DSP_RESET, 0);
+		// close the device
 		close(audio_fd);
+		audio_fd = -1;
 		snd_inited = 0;
 	}
 }
@@ -277,3 +293,4 @@ void *S_LockBuffer(void)
 void S_UnlockBuffer(void)
 {
 }
+