summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2024-01-20 16:17:08 -0600
committerDudemanguy <random342@airmail.cc>2024-01-20 23:24:48 +0000
commita39f9b6181ee54732050d64540703ca2e2c90a8d (patch)
treef1fd47d034c4bf9792f5097b890703fd044f272c
parent5871ba8f3e7e728d2efcbfdbe1d67059f8feca4d (diff)
downloadmpv-a39f9b6181ee54732050d64540703ca2e2c90a8d.tar.bz2
mpv-a39f9b6181ee54732050d64540703ca2e2c90a8d.tar.xz
player: remove --term-remaining-playtime option
This wasn't useful and didn't even really do what it said anyway. Closes #12167.
-rw-r--r--DOCS/interface-changes.rst1
-rw-r--r--DOCS/man/options.rst4
-rw-r--r--options/options.c2
-rw-r--r--options/options.h1
-rw-r--r--player/osd.c3
5 files changed, 2 insertions, 9 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index d5742d900c..af17ea2f6a 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -40,6 +40,7 @@ Interface changes
- add `--sub-filter-sdh-enclosures` option
- added the `mp.input` scripting API to query the user for textual input
- add `forced` choice to `subs-with-matching-audio`
+ - remove `--term-remaining-playtime` option
--- mpv 0.37.0 ---
- `--save-position-on-quit` and its associated commands now store state files
in %LOCALAPPDATA% instead of %APPDATA% directory by default on Windows.
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index c8eb77bb5f..53668bdbe6 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -4887,10 +4887,6 @@ Terminal
See `Property Expansion`_.
-``--term-remaining-playtime``, ``--no-term-remaining-playtime``
- When printing out the time on the terminal, show the remaining time adjusted by
- playback speed. Default: ``yes``
-
``--term-status-msg=<string>``
Print out a custom string during playback instead of the standard status
line. Expands properties. See `Property Expansion`_.
diff --git a/options/options.c b/options/options.c
index c94ca891a6..da75bb21ed 100644
--- a/options/options.c
+++ b/options/options.c
@@ -823,7 +823,6 @@ static const m_option_t mp_opts[] = {
{"term-osd-bar", OPT_BOOL(term_osd_bar), .flags = UPDATE_OSD},
{"term-osd-bar-chars", OPT_STRING(term_osd_bar_chars), .flags = UPDATE_OSD},
- {"term-remaining-playtime", OPT_BOOL(term_remaining_playtime), .flags = UPDATE_OSD},
{"term-title", OPT_STRING(term_title), .flags = UPDATE_OSD},
{"term-playing-msg", OPT_STRING(playing_msg)},
@@ -978,7 +977,6 @@ static const struct MPOpts mp_default_opts = {
.frame_dropping = 1,
.term_osd = 2,
.term_osd_bar_chars = "[-+-]",
- .term_remaining_playtime = true,
.consolecontrols = true,
.playlist_pos = -1,
.play_frames = -1,
diff --git a/options/options.h b/options/options.h
index c951bcb748..7f5bea87fd 100644
--- a/options/options.h
+++ b/options/options.h
@@ -247,7 +247,6 @@ typedef struct MPOpts {
int term_osd;
bool term_osd_bar;
char *term_osd_bar_chars;
- bool term_remaining_playtime;
char *term_title;
char *playing_msg;
char *osd_playing_msg;
diff --git a/player/osd.c b/player/osd.c
index d655ba4bcb..96ab287227 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -190,10 +190,9 @@ static char *get_term_status_msg(struct MPContext *mpctx)
saddf(&line, ": ");
// Playback position
- double speed = opts->term_remaining_playtime ? mpctx->video_speed : 1;
sadd_hhmmssff(&line, get_playback_time(mpctx), opts->osd_fractions);
saddf(&line, " / ");
- sadd_hhmmssff(&line, get_time_length(mpctx) / speed, opts->osd_fractions);
+ sadd_hhmmssff(&line, get_time_length(mpctx), opts->osd_fractions);
sadd_percentage(&line, get_percent_pos(mpctx));