summaryrefslogtreecommitdiffstats
path: root/player/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-01 20:01:02 +0200
committerwm4 <wm4@nowhere>2016-09-01 20:01:02 +0200
commite4e1dc3c79e192d6c4476a2b52f9ca890385d433 (patch)
treeec186a82e903bc29b9b269d7d13dacc7bac12e36 /player/command.c
parentd32bee5f019f2c51839df16b7c7955dc33651cbe (diff)
downloadmpv-e4e1dc3c79e192d6c4476a2b52f9ca890385d433.tar.bz2
mpv-e4e1dc3c79e192d6c4476a2b52f9ca890385d433.tar.xz
command: rename/deprecate some conflicting property names
These conflict with options of the same name, and prevent a "full" unification. Not addressed is the "cache" property, and possibly a few properties that behave differently from their equivalent options.
Diffstat (limited to 'player/command.c')
-rw-r--r--player/command.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/player/command.c b/player/command.c
index 0d8767e922..d8872fa720 100644
--- a/player/command.c
+++ b/player/command.c
@@ -3730,7 +3730,9 @@ static const struct m_property mp_properties_base[] = {
{"media-title", mp_property_media_title},
{"stream-path", mp_property_stream_path},
{"stream-capture", mp_property_stream_capture},
- {"demuxer", mp_property_demuxer}, // conflicts with option
+ {"current-demuxer", mp_property_demuxer},
+ // conflicts with option
+ M_PROPERTY_DEPRECATED_ALIAS("demuxer", "current-demuxer"),
{"file-format", mp_property_file_format},
{"stream-pos", mp_property_stream_pos},
{"stream-end", mp_property_stream_end},
@@ -3780,7 +3782,8 @@ static const struct m_property mp_properties_base[] = {
{"clock", mp_property_clock},
{"seekable", mp_property_seekable},
{"partially-seekable", mp_property_partially_seekable},
- {"idle", mp_property_idle}, // conflicts with option
+ {"idle-active", mp_property_idle},
+ M_PROPERTY_DEPRECATED_ALIAS("idle", "idle-active"), // conflicts with option
{"chapter-list", mp_property_list_chapters},
{"track-list", property_list_tracks},
@@ -3848,7 +3851,8 @@ static const struct m_property mp_properties_base[] = {
{"vo-configured", mp_property_vo_configured},
{"vo-performance", mp_property_vo_performance},
{"current-vo", mp_property_vo},
- {"fps", mp_property_fps}, // conflicts with option
+ {"container-fps", mp_property_fps},
+ M_PROPERTY_DEPRECATED_ALIAS("fps", "container-fps"), // conflicts with option
{"estimated-vf-fps", mp_property_vf_fps},
{"video-aspect", mp_property_aspect},
{"vid", mp_property_video},