summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
Diffstat (limited to 'player')
-rw-r--r--player/command.c1
-rw-r--r--player/core.h3
-rw-r--r--player/loadfile.c2
-rw-r--r--player/osd.c6
4 files changed, 2 insertions, 10 deletions
diff --git a/player/command.c b/player/command.c
index 74c7e26966..48a23b7719 100644
--- a/player/command.c
+++ b/player/command.c
@@ -4199,7 +4199,6 @@ static const struct property_osd_display {
{ "loop", "Loop" },
{ "chapter", .seek_msg = OSD_SEEK_INFO_CHAPTER_TEXT,
.seek_bar = OSD_SEEK_INFO_BAR },
- { "edition", .seek_msg = OSD_SEEK_INFO_EDITION },
{ "hr-seek", "hr-seek" },
{ "speed", "Speed" },
{ "clock", "Clock" },
diff --git a/player/core.h b/player/core.h
index 5d055482a5..d8640d9ef0 100644
--- a/player/core.h
+++ b/player/core.h
@@ -52,8 +52,7 @@ enum mp_osd_seek_info {
OSD_SEEK_INFO_BAR = 1,
OSD_SEEK_INFO_TEXT = 2,
OSD_SEEK_INFO_CHAPTER_TEXT = 4,
- OSD_SEEK_INFO_EDITION = 8,
- OSD_SEEK_INFO_CURRENT_FILE = 16,
+ OSD_SEEK_INFO_CURRENT_FILE = 8,
};
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++) {
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",