summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-03-15 20:53:59 +0100
committerwm4 <wm4@nowhere>2014-03-15 20:53:59 +0100
commitf6b4f60264000ab16459639063cdfae64c3db942 (patch)
treeba6d80c60d82d1295d1ef424b1e640e336df1218
parente09a8ec4fa415e8df9dc1d019141b9b482ffe111 (diff)
downloadmpv-f6b4f60264000ab16459639063cdfae64c3db942.tar.bz2
mpv-f6b4f60264000ab16459639063cdfae64c3db942.tar.xz
command: rename dvd- properties to disc-
Since these are not DVD-only, but can also be used with BDs.
-rw-r--r--DOCS/man/en/input.rst8
-rw-r--r--player/command.c14
2 files changed, 11 insertions, 11 deletions
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index c1b1506d4c..f5efb1f49e 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -616,11 +616,11 @@ an option at runtime.
Current MKV edition number. Setting this property to a different value will
restart playback. The number of the first edition is 0.
-``dvd-titles``
- Number of DVD titles.
+``disc-titles``
+ Number of BD/DVD titles.
-``dvd-title``
- Current DVD title number.
+``disc-title``
+ Current BD/DVD title number.
``chapters``
Number of chapters.
diff --git a/player/command.c b/player/command.c
index 1fa81d1b0d..0af012bb16 100644
--- a/player/command.c
+++ b/player/command.c
@@ -436,8 +436,8 @@ static int mp_property_playtime_remaining(m_option_t *prop, int action,
return property_time(prop, action, arg, remaining / speed);
}
-/// Current DVD title (RO)
-static int mp_property_dvd_title(m_option_t *prop, int action, void *arg,
+/// Current BD/DVD title (RO)
+static int mp_property_disc_title(m_option_t *prop, int action, void *arg,
MPContext *mpctx)
{
struct demuxer *demuxer = mpctx->master_demuxer;
@@ -722,9 +722,9 @@ static int mp_property_quvi_format(m_option_t *prop, int action, void *arg,
return mp_property_generic_option(prop, action, arg, mpctx);
}
-/// Number of titles in DVD
-static int mp_property_dvd_titles(m_option_t *prop, int action, void *arg,
- MPContext *mpctx)
+/// Number of titles in BD/DVD
+static int mp_property_disc_titles(m_option_t *prop, int action, void *arg,
+ MPContext *mpctx)
{
struct demuxer *demuxer = mpctx->master_demuxer;
unsigned int num_titles;
@@ -2118,12 +2118,12 @@ static const m_option_t mp_properties[] = {
M_OPT_MIN, 0, 0, NULL },
{ "time-remaining", mp_property_remaining, CONF_TYPE_TIME },
{ "playtime-remaining", mp_property_playtime_remaining, CONF_TYPE_TIME },
- { "dvd-title", mp_property_dvd_title, CONF_TYPE_INT, M_OPT_MIN, -1, 0, NULL },
+ { "disc-title", mp_property_disc_title, CONF_TYPE_INT, M_OPT_MIN, -1, 0, NULL },
{ "chapter", mp_property_chapter, CONF_TYPE_INT,
M_OPT_MIN, -1, 0, NULL },
M_OPTION_PROPERTY_CUSTOM("edition", mp_property_edition),
M_OPTION_PROPERTY_CUSTOM("quvi-format", mp_property_quvi_format),
- { "dvd-titles", mp_property_dvd_titles, CONF_TYPE_INT,
+ { "disc-titles", mp_property_disc_titles, CONF_TYPE_INT,
0, 0, 0, NULL },
{ "chapters", mp_property_chapters, CONF_TYPE_INT,
0, 0, 0, NULL },