[MPlayer-cvslog] CVS: main mplayer.c,1.851,1.852

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

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

Modified Files:
	mplayer.c 
Log Message:
simplify osd-status display, and allow e.g. osd -2 to get the old behaviour


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -r1.851 -r1.852
--- mplayer.c	30 Jun 2005 09:38:55 -0000	1.851
+++ mplayer.c	30 Jun 2005 10:11:50 -0000	1.852
@@ -2921,7 +2921,7 @@
 	  osd_level= v > MAX_OSD_LEVEL ? MAX_OSD_LEVEL : v;
 	/* Show OSD state when disabled, but not when an explicit
 	   argument is given to the osd command, i.e. in slave mode. */
-	if (v < 0 && osd_level <= 1)
+	if (v == -1 && osd_level <= 1)
 	  osd_show_status = 9;
       }
 #endif
@@ -4132,11 +4132,17 @@
 	      vo_osd_changed(OSDTYPE_OSD);
       }
   } else {
-      if(vo_osd_text && osd_show_status <= 0) {
+      if(vo_osd_text) {
          vo_osd_text=NULL;
 	  vo_osd_changed(OSDTYPE_OSD);
       }
   }
+  if (osd_level <= 1 && osd_show_status > 0 && sh_video) {
+    vo_osd_text = osd_text_buffer;
+    snprintf(vo_osd_text, 63, "OSD: %sabled", osd_level ? "en" : "dis");
+    vo_osd_changed(OSDTYPE_OSD);
+    osd_show_status--;
+  }
 //  for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0;
 //  vo_osd_text=osd_text_buffer;
 #endif