X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_video.c;h=692dc9410425ae467e22e9af84a511aa77e8be44;hb=0f0e9d87816ec41bb20bd41e9d3adfdb61650b75;hp=cd34f6f07f2ddeb560543e009c67faa7de512865;hpb=ce52d79dfc936b5a7607f5ce59e6e3fdfcaee2b5;p=xonotic%2Fdarkplaces.git

diff --git a/cl_video.c b/cl_video.c
index cd34f6f0..692dc941 100644
--- a/cl_video.c
+++ b/cl_video.c
@@ -10,7 +10,6 @@ static int  cl_videogmask;
 static int	cl_videobytesperpixel;
 
 static clvideo_t videoarray[ MAXCLVIDEOS ];
-static mempool_t *cl_videomempool;
 static rtexturepool_t *cl_videotexturepool;
 
 static clvideo_t *FindUnusedVid( void )
@@ -44,8 +43,8 @@ static void SuspendVideo( clvideo_t * video )
 	// free the image data
 	Mem_Free( video->imagedata );
 	// if we are in firstframe mode, also close the stream
-	if( video->state == CLVIDEO_FIRSTFRAME ) 
-		dpvsimpledecode_close( video->stream );	
+	if( video->state == CLVIDEO_FIRSTFRAME )
+		dpvsimpledecode_close( video->stream );
 }
 
 static qboolean WakeVideo( clvideo_t * video )
@@ -59,10 +58,10 @@ static qboolean WakeVideo( clvideo_t * video )
 			video->state = CLVIDEO_UNUSED;
 			return false;
 		}
-		
-	video->imagedata = Mem_Alloc( cl_videomempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
-	video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name, 
-		video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, 0, NULL );    
+
+	video->imagedata = Mem_Alloc( cl_mempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
+	video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name,
+		video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, 0, NULL );
 
 	// update starttime
 	video->starttime += realtime - video->lasttime;
@@ -70,7 +69,7 @@ static qboolean WakeVideo( clvideo_t * video )
 	return true;
 }
 
-static clvideo_t* OpenVideo( clvideo_t *video, char *filename, char *name, int owner )
+static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char *name, int owner )
 {
 	strncpy( video->filename, filename, MAX_QPATH );
 	video->ownertag = owner;
@@ -88,15 +87,15 @@ static clvideo_t* OpenVideo( clvideo_t *video, char *filename, char *name, int o
 
 	video->cpif.width = dpvsimpledecode_getwidth( video->stream );
 	video->cpif.height = dpvsimpledecode_getheight( video->stream );
-	video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name, 
+	video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name,
 		video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, 0, NULL );
 
-    video->imagedata = Mem_Alloc( cl_videomempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
+    video->imagedata = Mem_Alloc( cl_mempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
 
 	return video;
 }
 
-clvideo_t* CL_OpenVideo( char *filename, char *name, int owner )
+clvideo_t* CL_OpenVideo( const char *filename, const char *name, int owner )
 {
 	clvideo_t *video;
 
@@ -108,13 +107,13 @@ clvideo_t* CL_OpenVideo( char *filename, char *name, int owner )
 	return OpenVideo( video, filename, name, owner );
 }
 
-clvideo_t* CL_GetVideo( char *name )
+clvideo_t* CL_GetVideo( const char *name )
 {
 	int i;
 	clvideo_t *video;
 
 	for( i = 0 ; i < MAXCLVIDEOS ; i++ )
-		if( videoarray[ i ].state != CLVIDEO_UNUSED 
+		if( videoarray[ i ].state != CLVIDEO_UNUSED
 			&&	!strcmp( videoarray[ i ].cpif.name , name ) )
 			break;
 	if( i == MAXCLVIDEOS )
@@ -125,7 +124,7 @@ clvideo_t* CL_GetVideo( char *name )
 	{
 		if( !WakeVideo( video ) )
 			return NULL;
-		else if( video->state == CLVIDEO_RESETONWAKEUP ) 
+		else if( video->state == CLVIDEO_RESETONWAKEUP )
 			video->framenum = -1;
 	}
 
@@ -149,7 +148,7 @@ void CL_RestartVideo( clvideo_t *video )
 {
 	if( !video )
 		return;
-    
+
 	video->starttime = video->lasttime = realtime;
 	video->framenum = -1;
 
@@ -186,9 +185,9 @@ static void VideoFrame( clvideo_t *video )
 	if( video->framenum < destframe ) {
 		do {
 			video->framenum++;
-			if( dpvsimpledecode_video( video->stream, video->imagedata, cl_videormask, 
-				cl_videogmask, cl_videobmask, cl_videobytesperpixel, 
-				cl_videobytesperpixel * video->cpif.width ) 
+			if( dpvsimpledecode_video( video->stream, video->imagedata, cl_videormask,
+				cl_videogmask, cl_videobmask, cl_videobytesperpixel,
+				cl_videobytesperpixel * video->cpif.width )
 				) { // finished?
 				CL_RestartVideo( video );
 				if( video->state == CLVIDEO_PLAY )
@@ -197,7 +196,7 @@ static void VideoFrame( clvideo_t *video )
 			}
 		} while( video->framenum < destframe );
 		R_UpdateTexture( video->cpif.tex, video->imagedata );
-	}					
+	}
 }
 
 void CL_VideoFrame( void ) // update all videos
@@ -212,7 +211,7 @@ void CL_VideoFrame( void ) // update all videos
 				SuspendVideo( video );
 			else if( video->state == CLVIDEO_PAUSE )
 				video->starttime = realtime - video->framenum * video->framerate;
-			else 
+			else
 				VideoFrame( video );
 		}
 
@@ -225,8 +224,6 @@ void CL_Video_Shutdown( void )
 	int i;
 	for( i = 0 ; i < MAXCLVIDEOS ; i++ )
 		CL_CloseVideo( &videoarray[ i ] );
-
-	Mem_FreePool( &cl_videomempool );
 }
 
 void CL_PurgeOwner( int owner )
@@ -242,11 +239,13 @@ int cl_videoplaying = false; // old, but still supported
 void CL_DrawVideo(void)
 {
 	if (cl_videoplaying)
-		DrawQ_Pic(0, 0, videoarray->cpif.name, vid.conwidth, vid.conheight, 1, 1, 1, 1, 0);
+		DrawQ_Pic(0, 0, videoarray->cpif.name, vid_conwidth.integer, vid_conheight.integer, 1, 1, 1, 1, 0);
 }
 
 void CL_VideoStart(char *filename)
 {
+	Host_StartVideo();
+
 	if( videoarray->state != CLVIDEO_UNUSED )
 		CL_CloseVideo( videoarray );
 	if( !OpenVideo( videoarray, filename, va( CLVIDEOPREFIX "%s", filename ), 0 ) )
@@ -269,6 +268,8 @@ static void CL_PlayVideo_f(void)
 {
 	char name[1024];
 
+	Host_StartVideo();
+
 	if (Cmd_Argc() != 2)
 	{
 		Con_Print("usage: playvideo <videoname>\nplays video named video/<videoname>.dpv\n");
@@ -293,7 +294,7 @@ static void cl_video_start( void )
 
 	for( video = videoarray, i = 0 ; i < MAXCLVIDEOS ; i++, video++ )
 		if( video->state != CLVIDEO_UNUSED && !video->suspended )
-			video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name, 
+			video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name,
 				video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, 0, NULL );
 }
 
@@ -315,8 +316,6 @@ void CL_Video_Init( void )
 
 	Cmd_AddCommand( "playvideo", CL_PlayVideo_f );
 	Cmd_AddCommand( "stopvideo", CL_StopVideo_f );
-	
-	cl_videomempool = Mem_AllocPool( "CL_Video", 0, NULL );
 
 	R_RegisterModule( "CL_Video", cl_video_start, cl_video_shutdown, cl_video_newmap );
 }