diff options
author | wm4 <wm4@nowhere> | 2016-09-02 09:42:19 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-09-02 09:42:19 +0200 |
commit | 3659f9e41646b95dc812640a49bb0b8cb879e441 (patch) | |
tree | faac69eb141daeb80f9b5ba572fc41241e0dd587 /player/command.c | |
parent | ce05413a87ee24e706bf3cc044bf7eec422d034a (diff) | |
download | mpv-3659f9e41646b95dc812640a49bb0b8cb879e441.tar.bz2 mpv-3659f9e41646b95dc812640a49bb0b8cb879e441.tar.xz |
command: deprecate "cache" property, replace with "cache-percent"
The --cache option and cache property conflict, so one of them has to be
renamed. The option is probably used frequently, so initiate
deprecation/rename of the property.
Diffstat (limited to 'player/command.c')
-rw-r--r-- | player/command.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/player/command.c b/player/command.c index 17e320cd06..379ce07edb 100644 --- a/player/command.c +++ b/player/command.c @@ -3717,7 +3717,8 @@ static const struct m_property mp_properties_base[] = { {"eof-reached", mp_property_eof_reached}, {"seeking", mp_property_seeking}, {"playback-abort", mp_property_playback_abort}, - {"cache", mp_property_cache}, // conflicts with option + {"cache-percent", mp_property_cache}, + M_PROPERTY_DEPRECATED_ALIAS("cache", "cache-percent"), // conflicts with option {"cache-free", mp_property_cache_free}, {"cache-used", mp_property_cache_used}, {"cache-size", mp_property_cache_size}, @@ -3944,7 +3945,8 @@ static const char *const *const mp_event_property_change[] = { E(MPV_EVENT_CHAPTER_CHANGE, "chapter", "chapter-metadata"), E(MP_EVENT_CACHE_UPDATE, "cache", "cache-free", "cache-used", "cache-idle", "demuxer-cache-duration", "demuxer-cache-idle", "paused-for-cache", - "demuxer-cache-time", "cache-buffering-state", "cache-speed"), + "demuxer-cache-time", "cache-buffering-state", "cache-speed", + "cache-percent"), E(MP_EVENT_WIN_RESIZE, "window-scale", "osd-width", "osd-height", "osd-par"), E(MP_EVENT_WIN_STATE, "window-minimized", "display-names", "display-fps", "fullscreen"), |