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/loadfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'player/loadfile.c') 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++) { -- cgit v1.2.3