summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChrisK2 <spam@kalania.de>2014-05-24 17:47:31 +0200
committerChrisK2 <spam@kalania.de>2014-05-24 17:47:31 +0200
commit30fc1a42be5da85c574547508a0b4c734a98d106 (patch)
tree5561837544e833ed3682d984db3f2729a2e11e4d
parent7cc48f26e04701f2b9babc2608bc71b2cacd68c5 (diff)
downloadmpv-30fc1a42be5da85c574547508a0b4c734a98d106.tar.bz2
mpv-30fc1a42be5da85c574547508a0b4c734a98d106.tar.xz
osc: fix chapter list display
also fix small typo in DOCS
-rw-r--r--DOCS/man/en/lua.rst4
-rw-r--r--player/lua/osc.lua4
2 files changed, 4 insertions, 4 deletions
diff --git a/DOCS/man/en/lua.rst b/DOCS/man/en/lua.rst
index ab5a70ef57..144b1f8a59 100644
--- a/DOCS/man/en/lua.rst
+++ b/DOCS/man/en/lua.rst
@@ -411,8 +411,8 @@ with ``require 'mp.msg'``.
All of these are shortcuts and equivalent to the corresponding
``msg.log(level, ...)`` call.
-mp.option
----------
+mp.options
+----------
mpv comes with a built-in module to manage options from config-files and the
command-line. All you have to do is to supply a table with default options to
diff --git a/player/lua/osc.lua b/player/lua/osc.lua
index 1ef7e4b455..cf5f848d12 100644
--- a/player/lua/osc.lua
+++ b/player/lua/osc.lua
@@ -727,13 +727,13 @@ function osc_init()
--prev
local eventresponder = {}
eventresponder.mouse_btn0_up = function () mp.commandv("osd-msg", "add", "chapter", -1) end
- eventresponder["shift+mouse_btn0_up"] = function () show_message(mp.get_property("chapter-list"), 3) end
+ eventresponder["shift+mouse_btn0_up"] = function () show_message(mp.get_property_osd("chapter-list"), 3) end
register_button(posX - (bigbuttondistance * 2), bigbuttonrowY, 5, 40, 40, osc_styles.bigButtons, "\238\132\132", eventresponder, metainfo)
--next
local eventresponder = {}
eventresponder.mouse_btn0_up = function () mp.commandv("osd-msg", "add", "chapter", 1) end
- eventresponder["shift+mouse_btn0_up"] = function () show_message(mp.get_property("chapter-list"), 3) end
+ eventresponder["shift+mouse_btn0_up"] = function () show_message(mp.get_property_osd("chapter-list"), 3) end
register_button(posX + (bigbuttondistance * 2), bigbuttonrowY, 5, 40, 40, osc_styles.bigButtons, "\238\132\133", eventresponder, metainfo)