[Mplayer-cvslog] CVS: main mplayer.c,1.745,1.746

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	mplayer.c 
Log Message:
Display Framedropping state on the OSD.


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.745
retrieving revision 1.746
diff -u -r1.745 -r1.746
--- mplayer.c	29 Jan 2004 12:01:25 -0000	1.745
+++ mplayer.c	9 Feb 2004 20:20:24 -0000	1.746
@@ -736,6 +736,7 @@
 int osd_show_percentage = 0;
 int osd_show_tv_channel = 25;
 int osd_show_ontop = 0;
+int osd_show_framedropping = 0;
 
 int rtc_fd=-1;
 
@@ -2854,8 +2855,13 @@
     } break;
     case MP_CMD_FRAMEDROPPING :  {
       int v = cmd->args[0].v.i;
-      if(v < 0)
+      if(v < 0){
 	frame_dropping = (frame_dropping+1)%3;
+#ifdef USE_OSD
+       osd_show_framedropping=10;
+       vo_osd_changed(OSDTYPE_SUBTITLE);
+#endif
+      }
       else
 	frame_dropping = v > 2 ? 2 : v;
     } break;
@@ -3559,6 +3565,11 @@
       } else if (osd_show_ontop) {
 	  snprintf(osd_text_tmp, 63, "Stay on top: %sabled", vo_ontop?"en":"dis");
 	  osd_show_ontop--;
+      } else if (osd_show_framedropping) {
+	  snprintf(osd_text_tmp, 63, "Framedropping: %s",
+	     (frame_dropping == 1 ? "on" :
+	     (frame_dropping == 2 ? "hard"  : "off")));
+	  osd_show_framedropping--;
       } else if(osd_level>=2) {
           int len = demuxer_get_time_length(demuxer);
           int percentage = -1;