X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_video.h;h=7c6140fa26545a34e5b028d2156bac69d48924b3;hp=9e3c47c0dc1489283cb0082eb06c40d5f6491baa;hb=9ba01c31e0bebb3ada7724316d63a393053102d3;hpb=406539417c894954ef88ecc2fc28c26ad01bbba6

diff --git a/cl_video.h b/cl_video.h
index 9e3c47c0..7c6140fa 100644
--- a/cl_video.h
+++ b/cl_video.h
@@ -2,10 +2,10 @@
 #ifndef CL_VIDEO_H
 #define CL_VIDEO_H
 
-#include "cl_dyntexture.h"
+#include "qtypes.h"
+#include "qdefs.h"
 
-// yields DYNAMIC_TEXTURE_PATH_PREFIX CLVIDEOPREFIX video name for a path
-#define CLVIDEOPREFIX	CLDYNTEXTUREPREFIX "video/"
+#define CLVIDEOPREFIX	"video/"
 #define CLTHRESHOLD		2.0
 
 #define MENUOWNER		1
@@ -23,11 +23,14 @@ typedef enum clvideostate_e
 
 #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_brightness;
+extern struct cvar_s cl_video_subtitles;
+extern struct cvar_s cl_video_subtitles_lines;
+extern struct cvar_s cl_video_subtitles_textsize;
+extern struct cvar_s cl_video_scale;
+extern struct cvar_s cl_video_scale_vpos;
+extern struct cvar_s cl_video_stipple;
+extern struct cvar_s cl_video_brightness;
+extern struct cvar_s cl_video_keepaspectratio;
 
 typedef struct clvideo_s
 {
@@ -43,7 +46,11 @@ typedef struct clvideo_s
 
 	void	*imagedata;
 
-	cachepic_t cpif;
+	// cachepic holds the relevant texture_t and we simply update the texture as needed
+	struct cachepic_s *cachepic;
+	char	name[MAX_QPATH]; // name of this video UI element (not the filename)
+	int		width;
+	int		height;
 
 	// VorteX: subtitles array
 	int		subtitles;
@@ -51,12 +58,19 @@ typedef struct clvideo_s
 	float	subtitle_start[CLVIDEO_MAX_SUBTITLES];
 	float	subtitle_end[CLVIDEO_MAX_SUBTITLES];
 
-	// if a video is suspended, it is automatically paused (else we'd still have to process the frames)
+	// 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
-	qboolean suspended;
+	qbool suspended;
 
 	char	filename[MAX_QPATH];
 } clvideo_t;
@@ -82,6 +96,6 @@ void CL_VideoStop( void );
 
 // new function used for fullscreen videos
 // TODO: Andreas Kirsch: move this subsystem somewhere else (preferably host) since the cl_video system shouldnt do such work like managing key events..
-void CL_Video_KeyEvent( int key, int ascii, qboolean down );
+void CL_Video_KeyEvent( int key, int ascii, qbool down );
 
 #endif