X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_video.h;h=e96e2a478d4d9d3981c0ef5ff0ea17d3e5d947c9;hp=4277124e65eef76f01558973cf7cd5c2d36d5f59;hb=35b7d263c31d6576b488a3df4c1b06ad5acb3ecd;hpb=70b3c52211617e1d585a1bbe805c5fd47176bfd1

diff --git a/cl_video.h b/cl_video.h
index 4277124e..e96e2a47 100644
--- a/cl_video.h
+++ b/cl_video.h
@@ -2,10 +2,7 @@
 #ifndef CL_VIDEO_H
 #define CL_VIDEO_H
 
-#include "cl_dyntexture.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
@@ -46,7 +43,11 @@ 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;
@@ -59,6 +60,7 @@ typedef struct clvideo_s
 	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)