X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_video.c;h=130a58ffd3ce5ca4b552b7ccc8686ce6299c32af;hb=0945983f30c1cc05be50cffca388912098c513bd;hp=debe42232a4387e012c5509bac0c3bf24758b60d;hpb=cd21cb3be9de4da3b2c1d2cb029352947b48166c;p=xonotic%2Fdarkplaces.git

diff --git a/cl_video.c b/cl_video.c
index debe4223..130a58ff 100644
--- a/cl_video.c
+++ b/cl_video.c
@@ -20,18 +20,12 @@ int cl_videoimagedata_bmask;
 int cl_videoimagedata_bytesperpixel;
 void *cl_videoimagedata;
 
-int cl_videosoundrate;
-int cl_videosoundlength;
-short *cl_videosounddata;
-int cl_videosoundresamplelength;
-short *cl_videosoundresampledata;
-
 rtexture_t *cl_videotexture;
 rtexturepool_t *cl_videotexturepool;
 
 void CL_VideoFrame(void)
 {
-	int frames, framenum, samples, s;
+	int frames, framenum;
 	if (!cl_videoplaying)
 		return;
 	framenum = (realtime - cl_videostarttime) * cl_videoframerate;
@@ -54,35 +48,6 @@ void CL_VideoFrame(void)
 		R_UpdateTexture(cl_videotexture, cl_videoimagedata);
 		//Draw_NewPic("engine_videoframe", cl_videoimagewidth, cl_videoimageheight, false, cl_videoimagedata);
 	}
-	if (cl_videosoundrate && (samples = S_RawSamples_QueueWantsMore()))
-	{
-		Con_DPrintf("%i = S_RawSamples_QueueWantsMore()\n", samples);
-
-		// calculate how much source data we need to fill the output...
-		s = samples * cl_videosoundrate / S_RawSamples_SampleRate();
-
-		// reallocate processing buffer if needed
-		if (cl_videosoundresamplelength < samples)
-		{
-			cl_videosoundresamplelength = samples + 100;
-			if (cl_videosoundresampledata)
-				Mem_Free(cl_videosoundresampledata);
-			cl_videosoundresampledata = Mem_Alloc(clvideomempool, cl_videosoundresamplelength * sizeof(short[2]));
-		}
-
-		// reallocate loading buffer if needed
-		if (cl_videosoundlength < s)
-		{
-			cl_videosoundlength = s + 100;
-			if (cl_videosounddata)
-				Mem_Free(cl_videosounddata);
-			cl_videosounddata = Mem_Alloc(clvideomempool, cl_videosoundlength * sizeof(short[2]));
-		}
-
-		dpvsimpledecode_audio(cl_videostream, cl_videosounddata, s);
-		S_ResampleBuffer16Stereo(cl_videosounddata, s, cl_videosoundresampledata, samples);
-		S_RawSamples_Enqueue(cl_videosoundresampledata, samples);
-	}
 }
 
 void CL_DrawVideo(void)
@@ -109,12 +74,12 @@ void CL_DrawVideo(void)
 		vertex3f[ 6] = x2;vertex3f[ 7] = y2;vertex3f[ 8] = 0;
 		vertex3f[ 9] = x1;vertex3f[10] = y2;vertex3f[11] = 0;
 		mesh.texture = cl_videotexture;
-		mesh.numtriangles = 2;
-		mesh.numvertices = 4;
-		mesh.element3i = polygonelements;
-		mesh.vertex3f = vertex3f;
-		mesh.texcoord2f = texcoord2f;
-		mesh.color4f = color4f;
+		mesh.num_triangles = 2;
+		mesh.num_vertices = 4;
+		mesh.data_element3i = polygonelements;
+		mesh.data_vertex3f = vertex3f;
+		mesh.data_texcoord2f = texcoord2f;
+		mesh.data_color4f = color4f;
 		DrawQ_Mesh(&mesh, 0);
 		//DrawQ_Pic(0, 0, "engine_videoframe", vid.conwidth, vid.conheight, 1, 1, 1, 1, 0);
 	}
@@ -145,12 +110,6 @@ void CL_VideoStart(char *filename)
 	cl_videoimagedata = Mem_Alloc(clvideomempool, cl_videoimagewidth * cl_videoimageheight * cl_videoimagedata_bytesperpixel);
 	//memset(cl_videoimagedata, 97, cl_videoimagewidth * cl_videoimageheight * cl_videoimagedata_bytesperpixel);
 
-	cl_videosoundrate = dpvsimpledecode_getsoundrate(cl_videostream);
-	cl_videosoundlength = 0;
-	cl_videosounddata = NULL;
-	cl_videosoundresamplelength = 0;
-	cl_videosoundresampledata = NULL;
-
 	cl_videotexturepool = R_AllocTexturePool();
 	cl_videotexture = R_LoadTexture2D(cl_videotexturepool, "videotexture", cl_videoimagewidth, cl_videoimageheight, NULL, TEXTYPE_RGBA, TEXF_FRAGMENT, NULL);
 }
@@ -159,8 +118,6 @@ void CL_VideoStop(void)
 {
 	cl_videoplaying = false;
 
-	S_RawSamples_ClearQueue();
-
 	if (cl_videostream)
 		dpvsimpledecode_close(cl_videostream);
 	cl_videostream = NULL;
@@ -169,14 +126,6 @@ void CL_VideoStop(void)
 		Mem_Free(cl_videoimagedata);
 	cl_videoimagedata = NULL;
 
-	if (cl_videosounddata)
-		Mem_Free(cl_videosounddata);
-	cl_videosounddata = NULL;
-
-	if (cl_videosoundresampledata)
-		Mem_Free(cl_videosoundresampledata);
-	cl_videosoundresampledata = NULL;
-
 	cl_videotexture = NULL;
 	R_FreeTexturePool(&cl_videotexturepool);
 
@@ -189,7 +138,7 @@ static void CL_PlayVideo_f(void)
 
 	if (Cmd_Argc() != 2)
 	{
-		Con_Printf ("usage: playvideo <videoname>\nplays video named video/<videoname>.dpv\n");
+		Con_Print("usage: playvideo <videoname>\nplays video named video/<videoname>.dpv\n");
 		return;
 	}
 
@@ -207,5 +156,5 @@ void CL_Video_Init(void)
 	Cmd_AddCommand("playvideo", CL_PlayVideo_f);
 	Cmd_AddCommand("stopvideo", CL_StopVideo_f);
 
-	clvideomempool = Mem_AllocPool("CL_Video");
+	clvideomempool = Mem_AllocPool("CL_Video", 0, NULL);
 }