[Mplayer-cvslog] CVS: main/libvo mga_common.c,1.34,1.35 vo_xmga.c,1.71,1.72 vo_xv.c,1.94,1.95 vo_xvidix.c,1.39,1.40

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv31063/libvo

Modified Files:
	mga_common.c vo_xmga.c vo_xv.c vo_xvidix.c 
Log Message:
add mute support ( step 1 ) and fixed panscan bugs (1000l for me)

Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mga_common.c	5 Jun 2002 19:35:54 -0000	1.34
+++ mga_common.c	6 Jun 2002 07:13:57 -0000	1.35
@@ -282,6 +282,7 @@
 #endif
 #ifdef VO_XMGA
   case VOCTRL_GET_PANSCAN:
+      if ( !inited || !vo_fs ) return VO_FALSE;
       return VO_TRUE;
   case VOCTRL_SET_PANSCAN:
       if ( vo_fs && ( vo_panscan != vo_panscan_amount ) )

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- vo_xmga.c	5 Jun 2002 19:35:54 -0000	1.71
+++ vo_xmga.c	6 Jun 2002 07:13:57 -0000	1.72
@@ -90,6 +90,8 @@
 
 static XSetWindowAttributes   xWAttribs;
 
+static int inited=0;
+
 #define VO_XMGA
 #include "mga_common.c"
 #undef  VO_XMGA
@@ -201,8 +203,6 @@
    vo_mga_flip_page();
 }
 
-static int inited=0;
-
 static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t* info)
 {
  char                 * mTitle=(title == NULL) ? "XMGA render" : title;
@@ -340,7 +340,7 @@
  XSync( mDisplay,False );
 
  saver_off(mDisplay);
-
+ 
  return 0;
 }
 

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- vo_xv.c	5 Jun 2002 19:35:54 -0000	1.94
+++ vo_xv.c	6 Jun 2002 07:13:57 -0000	1.95
@@ -858,10 +858,9 @@
   case VOCTRL_GUISUPPORT:
     return VO_TRUE;
   case VOCTRL_GET_PANSCAN:
+    if ( !vo_config_count || !vo_fs ) return VO_FALSE;
     return VO_TRUE;
   case VOCTRL_SET_PANSCAN:
-
-// if((vo_fs && (vo_panscan != vo_panscan_amount)) || (!vo_fs && vo_panscan_amount))
    if ( vo_fs && ( vo_panscan != vo_panscan_amount ) )
      {
       panscan_calc();

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- vo_xvidix.c	5 Jun 2002 19:35:54 -0000	1.39
+++ vo_xvidix.c	6 Jun 2002 07:13:57 -0000	1.40
@@ -370,6 +370,8 @@
     XSync(mDisplay, False);
 
     saver_off(mDisplay); /* turning off screen saver */
+    
+    vo_config_count++;
 
     return(0);
 }
@@ -430,6 +432,7 @@
 
 static void uninit(void)
 {
+    if ( vo_config_count ) return;
     vidix_term();
 
     saver_on(mDisplay); /* screen saver back on */
@@ -464,6 +467,7 @@
     vo_x11_fullscreen();
     return VO_TRUE;
   case VOCTRL_GET_PANSCAN:
+      if ( !vo_config_count || !vo_fs ) return VO_FALSE;
       return VO_TRUE;
   case VOCTRL_SET_PANSCAN:
       if ( vo_fs && ( vo_panscan != vo_panscan_amount ) )