[Mplayer-cvslog] CVS: main/vidix vidix.h,1.3,1.4 vidixlib.c,1.4,1.5 vidixlib.h,1.2,1.3

[Nick Kurshev]

Update of /cvsroot/mplayer/main/vidix
In directory mplayer:/var/tmp.root/cvs-serv18307/main/vidix

Modified Files:
	vidix.h vidixlib.c vidixlib.h 
Log Message:
Minor interface changes: color and video keys are moved out from playback configuring

Index: vidix.h
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/vidix.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vidix.h	6 Jan 2002 16:00:12 -0000	1.3
+++ vidix.h	9 Jan 2002 18:58:25 -0000	1.4
@@ -137,13 +137,6 @@
 	unsigned	blend_factor;	/* app -> driver: blenfing factor */
 	vidix_rect_t	src;            /* app -> driver: original movie size */
 	vidix_rect_t	dest;           /* app -> driver: destinition movie size. driver->app dest_pitch */
-	vidix_ckey_t	ckey;		/* app -> driver: color key */
-	vidix_vkey_t	vkey;		/* app -> driver: video key */
-#define KEYS_PUT	0
-#define KEYS_AND	1
-#define KEYS_OR		2
-#define KEYS_XOR	3
-	unsigned	key_op;		/* app -> driver: keys operations */
 	/* memory model */
 	unsigned	frame_size;		/* driver -> app; destinition frame size */
 	unsigned	num_frames;		/* app -> driver; after call: driver -> app */
@@ -164,6 +157,24 @@
 
 			/* Returns 0 if ok else errno */
 extern int 	vixPlaybackFrameSelect( unsigned frame_idx );
+
+typedef struct vidix_grkey_s
+{
+	vidix_ckey_t	ckey;		/* app -> driver: color key */
+	vidix_vkey_t	vkey;		/* app -> driver: video key */
+#define KEYS_PUT	0
+#define KEYS_AND	1
+#define KEYS_OR		2
+#define KEYS_XOR	3
+	unsigned	key_op;		/* app -> driver: keys operations */
+}vidix_grkey_t;
+
+			/* Returns 0 if ok else errno */
+extern int 	vixGetGrKeys( vidix_grkey_t * );
+
+			/* Returns 0 if ok else errno */
+extern int 	vixSetGrKeys( const vidix_grkey_t * );
+
 
 typedef struct vidix_video_eq_s
 {

Index: vidixlib.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/vidixlib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vidixlib.c	6 Jan 2002 17:08:54 -0000	1.4
+++ vidixlib.c	9 Jan 2002 18:58:25 -0000	1.5
@@ -43,6 +43,8 @@
 	int 	(*get_eq)( vidix_video_eq_t * );
 	int 	(*set_eq)( const vidix_video_eq_t * );
 	int 	(*copy_frame)( const vidix_dma_t * );
+	int 	(*get_gkey)( vidix_grkey_t * );
+	int 	(*set_gkey)( const vidix_grkey_t * );
 }vdl_stream_t;
 
 #define t_vdl(p) (((vdl_stream_t *)p))
@@ -64,6 +66,8 @@
   t_vdl(stream)->frame_sel	= dlsym(t_vdl(stream)->handle,"vixPlaybackFrameSelect");
   t_vdl(stream)->get_eq	= dlsym(t_vdl(stream)->handle,"vixPlaybackGetEq");
   t_vdl(stream)->set_eq	= dlsym(t_vdl(stream)->handle,"vixPlaybackSetEq");
+  t_vdl(stream)->get_gkey	= dlsym(t_vdl(stream)->handle,"vixGetGrKeys");
+  t_vdl(stream)->set_gkey	= dlsym(t_vdl(stream)->handle,"vixSetGrKeys");
   t_vdl(stream)->copy_frame	= dlsym(t_vdl(stream)->handle,"vixPlaybackCopyFrame");
   /* check driver viability */
   if(!( t_vdl(stream)->get_caps && t_vdl(stream)->query_fourcc &&
@@ -249,4 +253,14 @@
 int  vdlPlaybackCopyFrame(VDL_HANDLE handle, const vidix_dma_t * f)
 {
   return t_vdl(handle)->copy_frame ? t_vdl(handle)->copy_frame(f) : ENOSYS;
+}
+
+int 	  vdlGetGrKeys(VDL_HANDLE handle, vidix_grkey_t * k)
+{
+  return t_vdl(handle)->get_gkey ? t_vdl(handle)->get_gkey(k) : ENOSYS;
+}
+
+int 	  vdlSetGrKeys(VDL_HANDLE handle, const vidix_grkey_t * k)
+{
+  return t_vdl(handle)->set_gkey ? t_vdl(handle)->set_gkey(k) : ENOSYS;
 }

Index: vidixlib.h
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/vidixlib.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vidixlib.h	5 Jan 2002 18:16:19 -0000	1.2
+++ vidixlib.h	9 Jan 2002 18:58:25 -0000	1.3
@@ -61,6 +61,12 @@
 extern int 	  vdlPlaybackFrameSelect(VDL_HANDLE, unsigned frame_idx );
 
 			/* Returns 0 if ok else errno */
+extern int 	  vdlGetGrKeys(VDL_HANDLE, vidix_grkey_t * );
+
+			/* Returns 0 if ok else errno */
+extern int 	  vdlSetGrKeys(VDL_HANDLE, const vidix_grkey_t * );
+
+			/* Returns 0 if ok else errno */
 extern int 	  vdlPlaybackGetEq(VDL_HANDLE, vidix_video_eq_t * );
 
 			/* Returns 0 if ok else errno */