[Mplayer-cvslog] CVS: main/libvo vo_cvidix.c,1.7,1.8

[Richard Felker CVS]

CVS change done by Richard Felker CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv20344/libvo

Modified Files:
	vo_cvidix.c 
Log Message:
10000l: color key cannot be used if we can't paint it!
also center the overlay in non-fullscreen mode to be consistent with other
vo drivers, e.g. mga_vid


Index: vo_cvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_cvidix.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_cvidix.c	15 Nov 2003 09:58:15 -0000	1.7
+++ vo_cvidix.c	6 Jul 2004 03:57:19 -0000	1.8
@@ -47,18 +47,17 @@
 static uint32_t setup_vidix(){
   int x=vo_dx,y=vo_dy;
   aspect(&vo_dwidth,&vo_dheight,vo_fs ? A_ZOOM : A_NOZOOM);  
-  if(vo_fs){
     if(vo_dwidth <= vo_screenwidth)x = (vo_screenwidth - vo_dwidth)/2;
     else x=0;
     if(vo_dheight <= vo_screenheight)y = (vo_screenheight - vo_dheight)/2;
     else y=0;
-  }
   if(vo_config_count)vidix_stop();
   if(vidix_init(swidth, sheight, x, y, vo_dwidth, vo_dheight, sformat, 32, vo_screenwidth,vo_screenheight)){
     mp_msg(MSGT_VO, MSGL_FATAL, "Can't setup VIDIX driver: %s\n", strerror(errno));
     return 1;
   }
   vidix_start();
+#if 0
   if(vidix_grkey_support()){
     vidix_grkey_get(&gr_key);
     gr_key.key_op = KEYS_PUT;
@@ -71,6 +70,7 @@
     else gr_key.ckey.op = CKEY_FALSE;
     vidix_grkey_set(&gr_key);
   }
+#endif
   return 0;
 }