summaryrefslogtreecommitdiffstats
path: root/mpvcore
diff options
context:
space:
mode:
authorChrisK2 <spam@kalania.de>2013-10-15 22:27:08 +0200
committerChrisK2 <spam@kalania.de>2013-10-15 22:30:33 +0200
commita54ca2da315b2fd62a037cd2e843208b02ab7270 (patch)
tree5a27a5e573bd8d1b5be3b01fe5d1b8de61ac6204 /mpvcore
parenta0485221c7a2d8c2a7b5638e4fbb386a1d23d912 (diff)
downloadmpv-a54ca2da315b2fd62a037cd2e843208b02ab7270.tar.bz2
mpv-a54ca2da315b2fd62a037cd2e843208b02ab7270.tar.xz
osc docs: Add documentation for OSC and rename some options
camelCase from some of the option names removed. If you were using those, you'll have to update them in your config.
Diffstat (limited to 'mpvcore')
-rw-r--r--mpvcore/lua/osc.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/mpvcore/lua/osc.lua b/mpvcore/lua/osc.lua
index 19bd8c90fe..5df43b8e2e 100644
--- a/mpvcore/lua/osc.lua
+++ b/mpvcore/lua/osc.lua
@@ -10,11 +10,11 @@ local msg = require 'mp.msg'
-- default user option values
-- do not touch, change them in plugin_osc.conf
local user_opts = {
- showWindowed = true, -- show OSC when windowed?
- showFullscreen = true, -- show OSC when fullscreen?
- scaleWindowed = 1, -- scaling of the controller when windowed
- scaleFullscreen = 1, -- scaling of the controller when fullscreen
- scaleForcedWindow = 2, -- scaling of the controller when rendered on a forced (dummy) window
+ show-windowed = true, -- show OSC when windowed?
+ show-fullscreen = true, -- show OSC when fullscreen?
+ scale-windowed = 1, -- scaling of the controller when windowed
+ scale-fullscreen = 1, -- scaling of the controller when fullscreen
+ scale-forcedwindow = 2, -- scaling of the controller when rendered on a forced (dummy) window
vidscale = true, -- scale the controller with the video?
valign = 0.8, -- vertical alignment, -1 (top) to 1 (bottom)
halign = 0, -- horizontal alignment, -1 (left) to 1 (right)
@@ -22,7 +22,7 @@ local user_opts = {
fadeduration = 200, -- duration of fade out in ms, 0 = no fade
deadzonesize = 0, -- size of deadzone
minmousemove = 3, -- minimum amount of pixels the mouse has to move between ticks to make the OSC show up
- iAmAProgrammer = false, -- use native mpv values and disable OSC internal playlist management (and some functions that depend on it)
+ iamaprogrammer = false, -- use native mpv values and disable OSC internal playlist management (and some functions that depend on it)
}
local osc_param = {