Removed the functions "S_RawSamples_*" and "S_ResampleBuffer16Stereo". They're useles...

[xonotic/darkplaces.git] / cl_video.c

diff --git a/cl_video.c b/cl_video.c
index a309b2e49288b9e9999e847d6d4c54691cdc9536..165f1b067bb75b9c00b3ea822fae6b9c2980dd3f 100644 (file)
--- 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)
@@ -103,18 +68,18 @@ void CL_DrawVideo(void)
                texcoord2f[2] = s2;texcoord2f[3] = t1;
                texcoord2f[4] = s2;texcoord2f[5] = t2;
                texcoord2f[6] = s1;texcoord2f[7] = t2;
-               R_FillColors(color4f, 4, r_colorscale, r_colorscale, r_colorscale, 1);
+               R_FillColors(color4f, 4, 1, 1, 1, 1);
                vertex3f[ 0] = x1;vertex3f[ 1] = y1;vertex3f[ 2] = 0;
                vertex3f[ 3] = x2;vertex3f[ 4] = y1;vertex3f[ 5] = 0;
                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,11 +138,11 @@ 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;
        }
 
-       sprintf(name, "%s/video/%s.dpv", fs_gamedir, Cmd_Argv(1));
+       sprintf(name, "video/%s.dpv", Cmd_Argv(1));
        CL_VideoStart(name);
 }