From 2ff0745ddb4b46b76c1e207e692e4f176c82e0b8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 5 Jan 2017 00:07:28 +0100 Subject: 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. --- player/osd.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'player/osd.c') 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", -- cgit v1.2.3