Mercurial > mplayer.hg

changeset 15863:7689a7c41225

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify osd-status display, and allow e.g. osd -2 to get the old behaviour
author reimar
date Thu, 30 Jun 2005 10:11:50 +0000
parents 30cd1a5f4274
children 9c674e162678
files mplayer.c
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Thu Jun 30 09:38:55 2005 +0000
+++ b/mplayer.c	Thu Jun 30 10:11:50 2005 +0000
@@ -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