[Mplayer-cvslog] CVS: main/libvo vo_xv.c,1.88,1.89

[Arpi of Ize]

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

Modified Files:
	vo_xv.c 
Log Message:
different message for busy Xv ports and missing Xv ports
message extended, based on Diego's patch


Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- vo_xv.c	19 May 2002 23:31:10 -0000	1.88
+++ vo_xv.c	24 May 2002 00:46:48 -0000	1.89
@@ -812,6 +812,7 @@
 static uint32_t preinit(const char *arg)
 {
     XvPortID xv_p;
+    int busy_ports=0;
     
     if(arg) 
     {
@@ -842,12 +843,20 @@
 		 xv_port = xv_p;
 		 break;
 	     } else {
-		 mp_msg(MSGT_VO,MSGL_ERR,"Xv: could not grab port %i\n", (int)xv_p);
+		 mp_msg(MSGT_VO,MSGL_WARN,"Xv: could not grab port %i\n", (int)xv_p);
+		 ++busy_ports;
 	     }
       }
     }
     if(!xv_port){
-	mp_msg(MSGT_VO,MSGL_ERR,"Couldn't find free Xvideo port - maybe other applications keep open it\n");
+      if(busy_ports)
+	mp_msg(MSGT_VO,MSGL_ERR,"Couldn't find free Xvideo port - maybe other applications keep open it.\n"
+	    "Close all video applications, and try again. If that does not help,\n"
+	    "see 'mplayer -vo help' for other (non-xv) video out drivers.\n");
+      else
+	mp_msg(MSGT_VO,MSGL_ERR,"It seems there is no Xvideo support for your video card available.\n"
+	    "Run 'xvinfo' to verify its Xv support, and read Xv section of DOCS/video.html !\n"
+	    "See 'mplayer -vo help' for other (non-xv) video out drivers. Try -vo x11\n");
 	return -1;
     }