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/osd.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/osd.c')
| -rw-r--r-- | player/osd.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/player/osd.c b/player/osd.c index 4dbdfe4024..2b95a10705 100644 --- a/player/osd.c +++ b/player/osd.c @@ -474,12 +474,6 @@ static void add_seek_osd_messages(struct MPContext *mpctx) "Chapter: %s", chapter); talloc_free(chapter); } - if ((mpctx->add_osd_seek_info & OSD_SEEK_INFO_EDITION) && mpctx->demuxer) { - set_osd_msg(mpctx, 1, mpctx->opts->osd_duration, - "Playing edition %d of %d.", - mpctx->demuxer->edition + 1, - mpctx->demuxer->num_editions); - } if (mpctx->add_osd_seek_info & OSD_SEEK_INFO_CURRENT_FILE) { if (mpctx->filename) { set_osd_msg(mpctx, 1, mpctx->opts->osd_duration, "%s", |