[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.72,1.73 x11_common.h,1.21,1.22

[Zoltan Ponekker]

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

Modified Files:
	x11_common.c x11_common.h 
Log Message:
upsz, 10l

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- x11_common.c	6 May 2002 15:05:07 -0000	1.72
+++ x11_common.c	6 May 2002 15:48:07 -0000	1.73
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 
 #include "config.h"
+#include "mp_msg.h"
 
 #ifdef X11_FULLSCREEN
 
@@ -304,7 +305,7 @@
   type=XInternAtom( mDisplay,"_NET_SUPPORTED",False );
   if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
    {
-    mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is NetWM.\n" );
+    mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is NetWM.\n" );
     XFree( args );
     vo_wm_type=vo_wm_NetWM;
    }
@@ -570,17 +571,17 @@
 	    
             if ( !strncmp( name,"_ICEWM_TRAY",11 ) )
 	      {
-	       mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is IceWM.\n" );
+	       mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is IceWM.\n" );
 	       vo_wm_type=vo_wm_IceWM;
 	      }
 	    if ( !strncmp( name,"_KDE_",5 ) )
 	      {
-	       mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is KDE.\n" );
+	       mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is KDE.\n" );
 	       vo_wm_type=vo_wm_KDE;
 	      }
 	    if ( !strncmp( name,"KWM_WIN_DESKTOP",15 ) )
 	      {
-	       mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" );
+	       mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" );
 	       vo_wm_type=vo_wm_WMakerStyle;
 	     }
 

Index: x11_common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- x11_common.h	6 May 2002 15:05:07 -0000	1.21
+++ x11_common.h	6 May 2002 15:48:07 -0000	1.22
@@ -43,9 +43,6 @@
  extern void vo_setwindow( Window w,GC g );
  extern void vo_x11_putkey(int key);
 #endif
-#ifdef HAVE_GUI
- extern Display * vo_display;
-#endif
 
 void saver_off( Display * );
 void saver_on( Display * );