summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-22 20:03:14 +0200
committerwm4 <wm4@nowhere>2015-05-22 20:03:14 +0200
commit450af05338fd0ea0ff33e2e03f934d7a4aa5f8fa (patch)
treef072c08db5620b48ccf79fd71749cdfa535d5a2b
parentd26803cba00f9ecfe7c1c0914f133e775638183b (diff)
downloadmpv-450af05338fd0ea0ff33e2e03f934d7a4aa5f8fa.tar.bz2
mpv-450af05338fd0ea0ff33e2e03f934d7a4aa5f8fa.tar.xz
options: rename --media-title option
Conflicts with the property.
-rw-r--r--DOCS/interface-changes.rst1
-rw-r--r--options/options.c3
-rw-r--r--player/lua/ytdl_hook.lua2
3 files changed, 4 insertions, 2 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index cae71465e2..b037588558 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -20,6 +20,7 @@ Interface changes
::
--- mpv 0.10.0 will be released ---
+ - deprecate --media-title, replaced with --force-media-title
- deprecate "length" property, replaced with "duration"
- change volume property:
- the value 100 is now always "unchanged volume" - with softvol, the
diff --git a/options/options.c b/options/options.c
index 4c46c6f190..44d4beae30 100644
--- a/options/options.c
+++ b/options/options.c
@@ -402,7 +402,7 @@ const m_option_t mp_opts[] = {
// vo name (X classname) and window title strings
OPT_STRING("x11-name", vo.winname, 0),
OPT_STRING("title", wintitle, 0),
- OPT_STRING("media-title", media_title, 0),
+ OPT_STRING("force-media-title", media_title, 0),
// set aspect ratio of monitor - useful for 16:9 TV-out
OPT_FLOATRANGE("monitoraspect", vo.force_monitor_aspect, 0, 0.0, 9.0),
OPT_FLOATRANGE("monitorpixelaspect", vo.monitor_pixel_aspect, 0, 0.2, 9.0),
@@ -632,6 +632,7 @@ const m_option_t mp_opts[] = {
OPT_REPLACED("mkv-subtitle-preroll", "demuxer-mkv-subtitle-preroll"),
OPT_REPLACED("dtshd", "ad-spdif-dtshd"),
OPT_REPLACED("ass-use-margins", "sub-use-margins"),
+ OPT_REPLACED("media-title", "force-media-title"),
{0}
};
diff --git a/player/lua/ytdl_hook.lua b/player/lua/ytdl_hook.lua
index 5e87bc3bc3..225c36364e 100644
--- a/player/lua/ytdl_hook.lua
+++ b/player/lua/ytdl_hook.lua
@@ -176,7 +176,7 @@ mp.add_hook("on_load", 10, function ()
mp.set_property("stream-open-filename", playlist)
if not (json.title == nil) then
- mp.set_property("file-local-options/media-title", json.title)
+ mp.set_property("file-local-options/force-media-title", json.title)
end
else