X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=snd_mix.c;h=efd562c21de80154a1082b183e2a6db1fe646155;hb=9976ca010e51f14b9dfe4c5bc1f945344d3d9bf7;hp=e9075ba8ea52da67b4d28ae451efe4659350cb27;hpb=8513d3b796133c22739c6395a020ef2a4b9b7bd3;p=xonotic%2Fdarkplaces.git

diff --git a/snd_mix.c b/snd_mix.c
index e9075ba8..efd562c2 100644
--- a/snd_mix.c
+++ b/snd_mix.c
@@ -21,31 +21,36 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
+typedef struct
+{
+	int left;
+	int right;
+} portable_samplepair_t;
+
 // LordHavoc: was 512, expanded to 2048
 #define	PAINTBUFFER_SIZE 2048
 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];
 int snd_scaletable[32][256];
 
-/*
-// LordHavoc: disabled this because it desyncs with the video too easily
+// FIXME: it desyncs with the video too easily
 extern cvar_t cl_avidemo;
-static FILE *cl_avidemo_soundfile = NULL;
-void S_CaptureAVISound(portable_samplepair_t *buf, int length)
+static qfile_t *cl_avidemo_soundfile = NULL;
+void S_CaptureAVISound(portable_samplepair_t *buf, size_t length)
 {
-	int i, n;
+	int n;
+	size_t i;
 	qbyte out[PAINTBUFFER_SIZE * 4];
-	char filename[MAX_OSPATH];
 
 	if (cl_avidemo.value >= 0.1f)
 	{
 		if (cl_avidemo_soundfile == NULL)
 		{
-			cl_avidemo_soundfile = FS_Open ("dpavi.wav", "wb", false);
+			cl_avidemo_soundfile = FS_Open ("video/dpavi.wav", "wb", false);
 			memset(out, 0, 44);
-			fwrite(out, 1, 44, cl_avidemo_soundfile);
+			FS_Write (cl_avidemo_soundfile, out, 44);
 			// header will be filled out when file is closed
 		}
-		fseek(cl_avidemo_soundfile, 0, SEEK_END);
+		FS_Seek (cl_avidemo_soundfile, 0, SEEK_END);
 		// write the sound buffer as little endian 16bit interleaved stereo
 		for(i = 0;i < length;i++)
 		{
@@ -58,7 +63,7 @@ void S_CaptureAVISound(portable_samplepair_t *buf, int length)
 			out[i*4+2] = n & 0xFF;
 			out[i*4+3] = (n >> 8) & 0xFF;
 		}
-		if (fwrite(out, 4, length, cl_avidemo_soundfile) < length)
+		if (FS_Write (cl_avidemo_soundfile, out, 4 * length) < 4 * length)
 		{
 			Cvar_SetValueQuick(&cl_avidemo, 0);
 			Con_Print("avi saving sound failed, out of disk space?  stopping avi demo capture.\n");
@@ -67,13 +72,13 @@ void S_CaptureAVISound(portable_samplepair_t *buf, int length)
 	else if (cl_avidemo_soundfile)
 	{
 		// file has not been closed yet, close it
-		fseek(cl_avidemo_soundfile, 0, SEEK_END);
-		i = ftell(cl_avidemo_soundfile);
+		FS_Seek (cl_avidemo_soundfile, 0, SEEK_END);
+		i = FS_Tell (cl_avidemo_soundfile);
 
 		//"RIFF", (int) unknown (chunk size), "WAVE",
 		//"fmt ", (int) 16 (chunk size), (short) format 1 (uncompressed PCM), (short) 2 channels, (int) unknown rate, (int) unknown bytes per second, (short) 4 bytes per sample (channels * bytes per channel), (short) 16 bits per channel
 		//"data", (int) unknown (chunk size)
-		memcpy(out, "RIFF****WAVEfmt \x10\x00\x00\x00\x01\x00\x02\x00********\x04\x00\x10\x00data****", 44);
+		memcpy (out, "RIFF****WAVEfmt \x10\x00\x00\x00\x01\x00\x02\x00********\x04\x00\x10\0data****", 44);
 		// the length of the whole RIFF chunk
 		n = i - 8;
 		out[4] = (n) & 0xFF;
@@ -81,13 +86,13 @@ void S_CaptureAVISound(portable_samplepair_t *buf, int length)
 		out[6] = (n >> 16) & 0xFF;
 		out[7] = (n >> 24) & 0xFF;
 		// rate
-		n = shm->speed;
+		n = shm->format.speed;
 		out[24] = (n) & 0xFF;
 		out[25] = (n >> 8) & 0xFF;
 		out[26] = (n >> 16) & 0xFF;
 		out[27] = (n >> 24) & 0xFF;
 		// bytes per second (rate * channels * bytes per channel)
-		n = shm->speed * 4;
+		n = shm->format.speed * 2 * 2;
 		out[28] = (n) & 0xFF;
 		out[29] = (n >> 8) & 0xFF;
 		out[30] = (n >> 16) & 0xFF;
@@ -99,13 +104,12 @@ void S_CaptureAVISound(portable_samplepair_t *buf, int length)
 		out[42] = (n >> 16) & 0xFF;
 		out[43] = (n >> 24) & 0xFF;
 
-		fseek(cl_avidemo_soundfile, 0, SEEK_SET);
-		fwrite(out, 1, 44, cl_avidemo_soundfile);
-		fclose(cl_avidemo_soundfile);
+		FS_Seek (cl_avidemo_soundfile, 0, SEEK_SET);
+		FS_Write (cl_avidemo_soundfile, out, 44);
+		FS_Close (cl_avidemo_soundfile);
 		cl_avidemo_soundfile = NULL;
 	}
 }
-*/
 
 void S_TransferPaintBuffer(int endtime)
 {
@@ -275,8 +279,8 @@ void S_PaintChannels(int endtime)
 		if (endtime - paintedtime > PAINTBUFFER_SIZE)
 			end = paintedtime + PAINTBUFFER_SIZE;
 
-		// clear the paint buffer, filling it with data from rawsamples (music/video/whatever)
-		S_RawSamples_Dequeue(&paintbuffer->left, end - paintedtime);
+		// clear the paint buffer
+		memset (&paintbuffer, 0, (end - paintedtime) * sizeof (paintbuffer[0]));
 
 		// paint in the channels.
 		ch = channels;
@@ -290,6 +294,17 @@ void S_PaintChannels(int endtime)
 			if (!S_LoadSound (sfx, true))
 				continue;
 
+			// if the channel is paused
+			if (ch->flags & CHANNELFLAG_PAUSED)
+			{
+				size_t pausedtime;
+
+				pausedtime = end - paintedtime;
+				ch->lastptime += pausedtime;
+				ch->end += pausedtime;
+				continue;
+			}
+
 			// if the sound hasn't been painted last time, update his position
 			if (ch->lastptime < paintedtime)
 			{
@@ -300,7 +315,7 @@ void S_PaintChannels(int endtime)
 				{
 					int loopstart;
 
-					if (ch->forceloop)
+					if (ch->flags & CHANNELFLAG_FORCELOOP)
 						loopstart = 0;
 					else
 						loopstart = -1;
@@ -329,6 +344,11 @@ void S_PaintChannels(int endtime)
 
 				if (count > 0)
 				{
+					if (ch->leftvol > 255)
+						ch->leftvol = 255;
+					if (ch->rightvol > 255)
+						ch->rightvol = 255;
+
 					if (sfx->format.width == 1)
 						stop_paint = !SND_PaintChannelFrom8(ch, count);
 					else
@@ -346,7 +366,7 @@ void S_PaintChannels(int endtime)
 				if (ltime >= ch->end)
 				{
 					// if at end of loop, restart
-					if ((sfx->loopstart >= 0 || ch->forceloop) && !stop_paint)
+					if ((sfx->loopstart >= 0 || (ch->flags & CHANNELFLAG_FORCELOOP)) && !stop_paint)
 					{
 						ch->pos = bound(0, sfx->loopstart, (int)sfx->total_length - 1);
 						ch->end = ltime + sfx->total_length - ch->pos;
@@ -358,16 +378,14 @@ void S_PaintChannels(int endtime)
 
 				if (stop_paint)
 				{
-					if (ch->sfx->fetcher->end != NULL)
-						ch->sfx->fetcher->end (ch);
-					ch->sfx = NULL;
+					S_StopChannel (ch - channels);
 					break;
 				}
 			}
 		}
 
 		// transfer out according to DMA format
-		//S_CaptureAVISound(paintbuffer, end - paintedtime);
+		S_CaptureAVISound (paintbuffer, end - paintedtime);
 		S_TransferPaintBuffer(end);
 		paintedtime = end;
 	}
@@ -390,11 +408,6 @@ qboolean SND_PaintChannelFrom8 (channel_t *ch, int count)
 	const sfxbuffer_t *sb;
 	int i, n;
 
-	if (ch->leftvol > 255)
-		ch->leftvol = 255;
-	if (ch->rightvol > 255)
-		ch->rightvol = 255;
-
 	lscale = snd_scaletable[ch->leftvol >> 3];
 	rscale = snd_scaletable[ch->rightvol >> 3];