X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_video.c;h=42c0496d679026ff9e5229329b32cd27bd6321cc;hb=17a6dfb7c9b37209272a4ea7e07b7dbccd5d0aa8;hp=c3a7fc98a55e0ddaa14d9217a296d90e7e2027a9;hpb=aa33d8f8642530f7f266d6cde1422f95aa74b2be;p=xonotic%2Fdarkplaces.git

diff --git a/cl_video.c b/cl_video.c
index c3a7fc98..42c0496d 100644
--- a/cl_video.c
+++ b/cl_video.c
@@ -9,15 +9,16 @@ static int  cl_videobmask;
 static int  cl_videogmask;
 static int	cl_videobytesperpixel;
 
-static clvideo_t videoarray[ MAXCLVIDEOS ];
+static int cl_num_videos;
+static clvideo_t cl_videos[ MAXCLVIDEOS ];
 static rtexturepool_t *cl_videotexturepool;
 
 static clvideo_t *FindUnusedVid( void )
 {
 	int i;
 	for( i = 1 ; i < MAXCLVIDEOS ; i++ )
-		if( videoarray[ i ].state == CLVIDEO_UNUSED )
-			return &videoarray[ i ];
+		if( cl_videos[ i ].state == CLVIDEO_UNUSED )
+			return &cl_videos[ i ];
 	return NULL;
 }
 
@@ -59,9 +60,9 @@ static qboolean WakeVideo( clvideo_t * video )
 			return false;
 		}
 
-	video->imagedata = Mem_Alloc( cl_mempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
+	video->imagedata = Mem_Alloc( cls.permanentmempool, 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->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, TEXF_ALWAYSPRECACHE, NULL );
 
 	// update starttime
 	video->starttime += realtime - video->lasttime;
@@ -71,11 +72,11 @@ static qboolean WakeVideo( clvideo_t * video )
 
 static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char *name, int owner )
 {
-	strncpy( video->filename, filename, MAX_QPATH );
+	strlcpy( video->filename, filename, sizeof(video->filename) );
 	video->ownertag = owner;
 	if( strncmp( name, CLVIDEOPREFIX, sizeof( CLVIDEOPREFIX ) - 1 ) )
 		return NULL;
-	strncpy( video->cpif.name, name, MAX_QPATH );
+	strlcpy( video->cpif.name, name, sizeof(video->cpif.name) );
 
 	if( !OpenStream( video ) )
 		return NULL;
@@ -88,9 +89,9 @@ static clvideo_t* OpenVideo( clvideo_t *video, const char *filename, const char
 	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.width, video->cpif.height, NULL, TEXTYPE_RGBA, 0, NULL );
+		video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, TEXF_ALWAYSPRECACHE, NULL );
 
-    video->imagedata = Mem_Alloc( cl_mempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
+    video->imagedata = Mem_Alloc( cls.permanentmempool, video->cpif.width * video->cpif.height * cl_videobytesperpixel );
 
 	return video;
 }
@@ -104,21 +105,16 @@ clvideo_t* CL_OpenVideo( const char *filename, const char *name, int owner )
 		Con_Printf( "unable to open video \"%s\" - video limit reached\n", filename );
 		return NULL;
 	}
-	return OpenVideo( video, filename, name, owner );
+	video = OpenVideo( video, filename, name, owner );
+	// expand the active range to include the new entry
+	if (video)
+		cl_num_videos = max(cl_num_videos, (int)(video - cl_videos) + 1);
+	return video;
 }
 
-clvideo_t* CL_GetVideo( const char *name )
+static clvideo_t* CL_GetVideoBySlot( int slot )
 {
-	int i;
-	clvideo_t *video;
-
-	for( i = 0 ; i < MAXCLVIDEOS ; i++ )
-		if( videoarray[ i ].state != CLVIDEO_UNUSED
-			&&	!strcmp( videoarray[ i ].cpif.name , name ) )
-			break;
-	if( i == MAXCLVIDEOS )
-		return NULL;
-	video = &videoarray[ i ];
+	clvideo_t *video = &cl_videos[ slot ];
 
 	if( video->suspended )
 	{
@@ -133,6 +129,20 @@ clvideo_t* CL_GetVideo( const char *name )
 	return video;
 }
 
+clvideo_t *CL_GetVideoByName( const char *name )
+{
+	int i;
+
+	for( i = 0 ; i < cl_num_videos ; i++ )
+		if( cl_videos[ i ].state != CLVIDEO_UNUSED
+			&&	!strcmp( cl_videos[ i ].cpif.name , name ) )
+			break;
+	if( i != cl_num_videos )
+		return CL_GetVideoBySlot( i );
+	else
+		return NULL;
+}
+
 void CL_SetVideoState( clvideo_t *video, clvideostate_t state )
 {
 	if( !video )
@@ -179,7 +189,7 @@ static void VideoFrame( clvideo_t *video )
 	if( video->state == CLVIDEO_FIRSTFRAME )
 		destframe = 0;
 	else
-		destframe = (realtime - video->starttime) * video->framerate;
+		destframe = (int)((realtime - video->starttime) * video->framerate);
 	if( destframe < 0 )
 		destframe = 0;
 	if( video->framenum < destframe ) {
@@ -195,7 +205,7 @@ static void VideoFrame( clvideo_t *video )
 				return;
 			}
 		} while( video->framenum < destframe );
-		R_UpdateTexture( video->cpif.tex, (qbyte *)video->imagedata );
+		R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, video->cpif.width, video->cpif.height );
 	}
 }
 
@@ -204,7 +214,10 @@ void CL_VideoFrame( void ) // update all videos
 	int i;
 	clvideo_t *video;
 
-	for( video = videoarray, i = 0 ; i < MAXCLVIDEOS ; video++, i++ )
+	if (!cl_num_videos)
+		return;
+
+	for( video = cl_videos, i = 0 ; i < cl_num_videos ; video++, i++ )
 		if( video->state != CLVIDEO_UNUSED && !video->suspended )
 		{
 			if( realtime - video->lasttime > CLTHRESHOLD )
@@ -215,23 +228,27 @@ void CL_VideoFrame( void ) // update all videos
 				VideoFrame( video );
 		}
 
-	if( videoarray->state == CLVIDEO_FIRSTFRAME )
+	if( cl_videos->state == CLVIDEO_FIRSTFRAME )
 		CL_VideoStop();
+
+	// reduce range to exclude unnecessary entries
+	while (cl_num_videos > 0 && cl_videos[cl_num_videos-1].state == CLVIDEO_UNUSED)
+		cl_num_videos--;
 }
 
 void CL_Video_Shutdown( void )
 {
 	int i;
-	for( i = 0 ; i < MAXCLVIDEOS ; i++ )
-		CL_CloseVideo( &videoarray[ i ] );
+	for( i = 0 ; i < cl_num_videos ; i++ )
+		CL_CloseVideo( &cl_videos[ i ] );
 }
 
 void CL_PurgeOwner( int owner )
 {
 	int i;
-	for( i = 0 ; i < MAXCLVIDEOS ; i++ )
-		if( videoarray[ i ].ownertag == owner )
-			CL_CloseVideo( &videoarray[ i ] );
+	for( i = 0 ; i < cl_num_videos ; i++ )
+		if( cl_videos[ i ].ownertag == owner )
+			CL_CloseVideo( &cl_videos[ i ] );
 }
 
 int cl_videoplaying = false; // old, but still supported
@@ -239,34 +256,46 @@ int cl_videoplaying = false; // old, but still supported
 void CL_DrawVideo(void)
 {
 	if (cl_videoplaying)
-		DrawQ_Pic(0, 0, videoarray->cpif.name, vid_conwidth.integer, vid_conheight.integer, 1, 1, 1, 1, 0);
+		DrawQ_Pic(0, 0, &CL_GetVideoBySlot( 0 )->cpif, 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 ) )
+	if( cl_videos->state != CLVIDEO_UNUSED )
+		CL_CloseVideo( cl_videos );
+	if( !OpenVideo( cl_videos, filename, va( CLVIDEOPREFIX "%s", filename ), 0 ) )
 		return;
+	// expand the active range to include the new entry
+	cl_num_videos = max(cl_num_videos, 1);
 
 	cl_videoplaying = true;
 
-	CL_SetVideoState( videoarray, CLVIDEO_PLAY );
-	CL_RestartVideo( videoarray );
+	CL_SetVideoState( cl_videos, CLVIDEO_PLAY );
+	CL_RestartVideo( cl_videos );
+}
+
+void CL_Video_KeyEvent( int key, int ascii, qboolean down ) 
+{
+	// only react to up events, to allow the user to delay the abortion point if it suddenly becomes interesting..
+	if( !down ) {
+		if( key == K_ESCAPE || key == K_ENTER || key == K_SPACE ) {
+			CL_VideoStop();
+		}
+	}
 }
 
 void CL_VideoStop(void)
 {
 	cl_videoplaying = false;
 
-	CL_CloseVideo( videoarray );
+	CL_CloseVideo( cl_videos );
 }
 
 static void CL_PlayVideo_f(void)
 {
-	char name[1024];
+	char name[MAX_QPATH];
 
 	Host_StartVideo();
 
@@ -292,10 +321,10 @@ static void cl_video_start( void )
 
 	cl_videotexturepool = R_AllocTexturePool();
 
-	for( video = videoarray, i = 0 ; i < MAXCLVIDEOS ; i++, video++ )
+	for( video = cl_videos, i = 0 ; i < cl_num_videos ; i++, video++ )
 		if( video->state != CLVIDEO_UNUSED && !video->suspended )
 			video->cpif.tex = R_LoadTexture2D( cl_videotexturepool, video->cpif.name,
-				video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, 0, NULL );
+				video->cpif.width, video->cpif.height, NULL, TEXTYPE_RGBA, TEXF_ALWAYSPRECACHE, NULL );
 }
 
 static void cl_video_shutdown( void )
@@ -309,13 +338,14 @@ static void cl_video_newmap( void )
 
 void CL_Video_Init( void )
 {
+	cl_num_videos = 0;
 	cl_videobytesperpixel = 4;
 	cl_videormask = BigLong(0xFF000000);
 	cl_videogmask = BigLong(0x00FF0000);
 	cl_videobmask = BigLong(0x0000FF00);
 
-	Cmd_AddCommand( "playvideo", CL_PlayVideo_f );
-	Cmd_AddCommand( "stopvideo", CL_StopVideo_f );
+	Cmd_AddCommand( "playvideo", CL_PlayVideo_f, "play a .dpv video file" );
+	Cmd_AddCommand( "stopvideo", CL_StopVideo_f, "stop playing a .dpv video file" );
 
 	R_RegisterModule( "CL_Video", cl_video_start, cl_video_shutdown, cl_video_newmap );
 }