From 423a75250f4fa66abf8be7b48586e2e5fc1212e9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 1 Aug 2012 00:39:49 +0200 Subject: mplayer: make display of playback status more uniform The code to format the playback time was duplicated a few times. There were also minor differences in how the time is formatted. Remove most of these differences. This also fixes a bug in the output of the osd_show_progression command, introduced in 74e7a1e937c10d9f4. There was some logic to display the percent position in the OSD status for a short while after seeking. Remove that logic and always display the percent position. Make --osd-fractions a flag option. This removes the ability to show the number of frames played since the start of the current second (i.e. the fraction of the time was turned into a frame number). This features wasn't so great anyway, because modern video file formats don't always have a (valid) FPS set, and could lead to inaccurate display. Still to sort out: Unfortunately, the terminal status is still formatted differently from the OSD, and even worse, it has a completely different time source. Not sure if I like how the status line looks now (it's a bit "full"?). Maybe it will be changed again later. --- cfg-mplayer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cfg-mplayer.h') diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 96b1e3c9c4..06a93d6bdb 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -744,7 +744,7 @@ const m_option_t mplayer_opts[]={ {"use-filename-title", &use_filename_title, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, OPT_INTRANGE("osdlevel", osd_level, 0, 0, 3), OPT_INTRANGE("osd-duration", osd_duration, 0, 0, 3600000), - OPT_INTRANGE("osd-fractions", osd_fractions, 0, 0, 2), + OPT_MAKE_FLAGS("osd-fractions", osd_fractions, 0), OPT_STRING("vobsub", vobsub_name, 0), {"vobsubid", &vobsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, -- cgit v1.2.3