summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-13 17:27:31 +0100
committerwm4 <wm4@nowhere>2014-11-13 17:27:31 +0100
commit71168e740e028dc33e22652589b095e870888615 (patch)
tree071ce91b6b8c2bbe4f9ccd0a54ab9f7c1b7606f4
parent13033ce2c4e05eaf031c09a4d41f3db9512af9c0 (diff)
downloadmpv-71168e740e028dc33e22652589b095e870888615.tar.bz2
mpv-71168e740e028dc33e22652589b095e870888615.tar.xz
command: rename "option-flags" property to "option-info"
-rw-r--r--DOCS/man/input.rst6
-rw-r--r--player/command.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst
index f58ac0dda3..db544d3ddd 100644
--- a/DOCS/man/input.rst
+++ b/DOCS/man/input.rst
@@ -1442,13 +1442,13 @@ Property list
access the local value, and the ``old`` value, which will be restored on
end of playback, can not be read or written until end of playback.)
-``option-flags/<name>``
- Minor additional per-option information.
+``option-info/<name>``
+ Additional per-option information.
This has a number of sub-properties. Replace ``<name>`` with the name of
a top-level option.
- ``option-flags/<name>/set-from-commandline``
+ ``option-info/<name>/set-from-commandline``
Return ``yes`` if the option was set from the mpv command line,
``no`` otherwise. What this is set to if the option is e.g. changed
diff --git a/player/command.c b/player/command.c
index 90ef7a8546..f60dfc6194 100644
--- a/player/command.c
+++ b/player/command.c
@@ -3003,8 +3003,8 @@ static int mp_property_local_options(void *ctx, struct m_property *prop,
return access_option_list(action, arg, true, mpctx);
}
-static int mp_property_option_flags(void *ctx, struct m_property *prop,
- int action, void *arg)
+static int mp_property_option_info(void *ctx, struct m_property *prop,
+ int action, void *arg)
{
MPContext *mpctx = ctx;
switch (action) {
@@ -3242,7 +3242,7 @@ static const struct m_property mp_properties[] = {
{"options", mp_property_options},
{"file-local-options", mp_property_local_options},
- {"option-flags", mp_property_option_flags},
+ {"option-info", mp_property_option_info},
{"property-list", mp_property_list},
{0},