X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_video.h;h=e96e2a478d4d9d3981c0ef5ff0ea17d3e5d947c9;hb=16e9a106940bacd4f6f185d96ab6ee63c62bcfdf;hp=cc38798f0c435413ebc7c089ce5bea351ef88b49;hpb=57975fbf6b9ae66a76430e1551cf74ded4ed7d44;p=xonotic%2Fdarkplaces.git

diff --git a/cl_video.h b/cl_video.h
index cc38798f..e96e2a47 100644
--- a/cl_video.h
+++ b/cl_video.h
@@ -2,8 +2,7 @@
 #ifndef CL_VIDEO_H
 #define CL_VIDEO_H
 
-#define MAXCLVIDEOS		64 + 1 // 1 video is reserved for the cinematic mode
-#define CLVIDEOPREFIX	"_video/"
+#define CLVIDEOPREFIX	"video/"
 #define CLTHRESHOLD		2.0
 
 #define MENUOWNER		1
@@ -19,6 +18,17 @@ typedef enum clvideostate_e
 	CLVIDEO_STATECOUNT
 } clvideostate_t;
 
+#define CLVIDEO_MAX_SUBTITLES 512
+
+extern cvar_t cl_video_subtitles;
+extern cvar_t cl_video_subtitles_lines;
+extern cvar_t cl_video_subtitles_textsize;
+extern cvar_t cl_video_scale;
+extern cvar_t cl_video_scale_vpos;
+extern cvar_t cl_video_stipple;
+extern cvar_t cl_video_brightness;
+extern cvar_t cl_video_keepaspectratio;
+
 typedef struct clvideo_s
 {
 	int		ownertag;
@@ -33,10 +43,27 @@ typedef struct clvideo_s
 
 	void	*imagedata;
 
-	cachepic_t cpif;
+	// cachepic holds the relevant texture_t and we simply update the texture as needed
+	cachepic_t *cachepic;
+	char	name[MAX_QPATH]; // name of this video UI element (not the filename)
+	int		width;
+	int		height;
+
+	// VorteX: subtitles array
+	int		subtitles;
+	char	*subtitle_text[CLVIDEO_MAX_SUBTITLES];
+	float	subtitle_start[CLVIDEO_MAX_SUBTITLES];
+	float	subtitle_end[CLVIDEO_MAX_SUBTITLES];
+
+	// this functions gets filled by video format module
+	void (*close) (void *stream);
+	unsigned int (*getwidth) (void *stream);
+	unsigned int (*getheight) (void *stream);
+	double (*getframerate) (void *stream);
+	double (*getaspectratio) (void *stream);
+	int (*decodeframe) (void *stream, void *imagedata, unsigned int Rmask, unsigned int Gmask, unsigned int Bmask, unsigned int bytesperpixel, int imagebytesperrow);
 
 	// if a video is suspended, it is automatically paused (else we'd still have to process the frames)
-
 	// used to determine whether the video's resources should be freed or not
     double  lasttime;
 	// when lasttime - realtime > THRESHOLD, all but the stream is freed
@@ -45,7 +72,7 @@ typedef struct clvideo_s
 	char	filename[MAX_QPATH];
 } clvideo_t;
 
-clvideo_t*	CL_OpenVideo( const char *filename, const char *name, int owner );
+clvideo_t*	CL_OpenVideo( const char *filename, const char *name, int owner, const char *subtitlesfile );
 clvideo_t*	CL_GetVideoByName( const char *name );
 void		CL_SetVideoState( clvideo_t *video, clvideostate_t state );
 void		CL_RestartVideo( clvideo_t *video );
@@ -53,7 +80,7 @@ void		CL_RestartVideo( clvideo_t *video );
 void		CL_CloseVideo( clvideo_t * video );
 void		CL_PurgeOwner( int owner );
 
-void		CL_VideoFrame( void ); // update all videos
+void		CL_Video_Frame( void ); // update all videos
 void		CL_Video_Init( void );
 void		CL_Video_Shutdown( void );
 
@@ -61,7 +88,7 @@ void		CL_Video_Shutdown( void );
 extern int cl_videoplaying;
 
 void CL_DrawVideo( void );
-void CL_VideoStart( char *filename );
+void CL_VideoStart( char *filename, const char *subtitlesfile );
 void CL_VideoStop( void );
 
 // new function used for fullscreen videos