diff options
| author | wm4 <wm4@nowhere> | 2017-01-05 00:07:28 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-01-05 00:07:28 +0100 |
| commit | 2ff0745ddb4b46b76c1e207e692e4f176c82e0b8 (patch) | |
| tree | cbeaaec2a17fe44783817d6adad197428459f8cf /player/loadfile.c | |
| parent | f34faca9106237f1b1a1608c72873d529e4ea627 (diff) | |
| download | mpv-2ff0745ddb4b46b76c1e207e692e4f176c82e0b8.tar.bz2 mpv-2ff0745ddb4b46b76c1e207e692e4f176c82e0b8.tar.xz | |
player: remove dysfunctional edition switching OSD code
Was intended to show a "nice" message on edition switching. In practice,
the message was never visible. The OSD code checks whether a demuxer is
loaded, and if not, discards the message - meaning if the OSD code
happened to run before the demuxer was fully loaded, no message was
shown. This is apparently a regression due to extensions to the OSD and
the situations in which it can be used.
Remove the broken code since it's too annoying to fix. Instead, a
default property message will be shown, which is a bit uglier, but
actually not too unuseful.
Diffstat (limited to 'player/loadfile.c')
| -rw-r--r-- | player/loadfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index b94ce8af43..b6027de0ca 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -977,7 +977,7 @@ static void play_current_file(struct MPContext *mpctx) mpctx->filename = talloc_strdup(NULL, mpctx->playing->filename); mpctx->stream_open_filename = mpctx->filename; - mpctx->add_osd_seek_info &= OSD_SEEK_INFO_EDITION | OSD_SEEK_INFO_CURRENT_FILE; + mpctx->add_osd_seek_info &= OSD_SEEK_INFO_CURRENT_FILE; if (opts->reset_options) { for (int n = 0; opts->reset_options[n]; n++) { |