Ticket #1459: mplayerquiettime-new-v6.diff

DOCS/man/en/mplayer.1

@@ -730 +730 @@
 (i.e.\& A:   0.7 V:   0.6 A-V:  0.068 ...) from being displayed.
 Particularly useful on slow terminals or broken ones which do not properly
 handle carriage return (i.e.\& \\r).
+See also: \-status\-rate\-max
 .
 .TP
 .B \-priority <prio> (Windows and OS/2 only)
@@ -759 +760 @@
 Show the description and content of a profile.
 .
 .TP
+.B "\-status\-rate\-max <n>\ "
+Reduce status line updates to a maximum of one per n milliseconds.
+Values of 500 or more work around slow terminals.
+See \-quiet for more.
+.
+.TP
 .B \-use\-filedir\-conf
 Look for a file-specific configuration file in the same directory as
 the file that is being played.

mplayer.c

@@ -79 +79 @@
 int slave_mode=0;
 int player_idle_mode=0;
 int quiet=0;
+int quiet_time=0;
 int enable_mouse_movements=0;
 float start_volume = -1;
 
@@ -1183 +1184 @@
   int width;
   char *line;
   unsigned pos = 0;
+
+  static unsigned int last_status_update = 0;
+
+  if (quiet_time) {
+    unsigned int now = GetTimerMS();
+    if (now - last_status_update >= quiet_time)
+      last_status_update = now;
+    else
+      return;
+  }
+
   get_screen_size();
   if (screen_width > 0)
     width = screen_width;

cfg-common-opts.h

@@ -8 +8 @@
 // ------------------------- common options --------------------
         {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
         {"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
+        {"status-rate-max", &quiet_time, CONF_TYPE_INT, CONF_RANGE, 0, 65536, NULL},
         {"really-quiet", &verbose, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_PRE_PARSE, 0, -10, NULL},
         {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL},
         {"msglevel", msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},

mencoder.c

@@ -126 +126 @@
 //void resync_audio_stream(sh_audio_t *sh_audio){}
 
 int quiet=0;
+int quiet_time=0;
 double video_time_usage=0;
 double vout_time_usage=0;
 double max_video_time_usage=0;
@@ -1402 +1403 @@
         off_t pos = demuxer->filepos >= 0 ? demuxer->filepos : stream_tell(demuxer->stream);
         float p=len>1000 ? (float)(pos-demuxer->movi_start) / len :
                 (demuxer_get_percent_pos(demuxer) / 100.0);
+
+        static unsigned int last_status_update = 0;
+        int update_status = !quiet && !quiet_time;
+        if (!quiet && quiet_time) {
+            unsigned int now = GetTimerMS();
+            if (now - last_status_update >= quiet_time) {
+                last_status_update = now;
+                update_status = 1;
+            }
+        }
 #if 0
         if(!len && sh_audio && sh_audio->audio.dwLength>100){
             p=(sh_audio->audio.dwSampleSize? ds_tell(sh_audio->ds)/sh_audio->audio.dwSampleSize : sh_audio->ds->block_no)
@@ -1414 +1425 @@
             (int)demuxer->filepos,
             (int)demuxer->movi_end);
 #else
-      if(!quiet) {
+      if(update_status) {
         if( mp_msg_test(MSGT_STATUSLINE,MSGL_V) ) {
                 mp_msg(MSGT_STATUSLINE,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb  A-V:%5.3f [%d:%d] A/Vms %d/%d D/B/S %d/%d/%d \r",
                 mux_v->timer, decoded_frameno, (int)(p*100),