RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-18 04:51:52 +00:00
Code Issues Releases Wiki Activity

osc: change default layout to bottombar

Browse Source 
Change a few other defaults accordingly:
- seekbarstyle=bar looks better with bottombar.
- Bigger scalewindowed and scalefullscreen make bottom/topbar more readable.
This commit is contained in:
Ricardo Constantino 2016-10-07 00:19:34 +01:00
parent 13259f35c8
commit 8bb57c0387
No known key found for this signature in database
GPG Key ID: EFD16019AE4FF531
2 changed files with 43 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
DOCS/man/osc.rst
View File

@ -20,25 +20,26 @@ The Interface
::
+------------------+-----------+--------------------+
| playlist prev | title | playlist next |
+-------+------+---+--+------+-+----+------+--------+
| audio | skip | seek | | seek | skip | full |
+-------+ back | back | play | frwd | frwd | screen |
| sub | | | | | | |
+-------+------+------+------+------+------+--------+
| seekbar |
+----------------+--------------+-------------------+
| time passed | cache status | time remaining |
+----------------+--------------+-------------------+
+---------+----------+----------------------------+-------------+
| pl prev | pl next | title | cache |
+------+--+---+------+---------+-----------+------+-------+-----+
| play | skip | skip | time | seekbar | time | audio | sub |
| | back | frwd | elapsed | | left | | |
+------+------+------+---------+-----------+------+-------+-----+
playlist prev
pl prev
============= ================================================
left-click play previous file in playlist
shift+L-click show playlist
============= ================================================
pl next
============= ================================================
left-click play next file in playlist
shift+L-click show playlist
============= ================================================
title
| Displays current media-title or filename
@ -47,19 +48,12 @@ title
right-click show filename
============= ================================================
playlist next
============= ================================================
left-click play next file in playlist
shift+L-click show playlist
============= ================================================
audio and sub
| Displays selected track and amount of available tracks
cache
| Shows current cache fill status
play
============= ================================================
left-click cycle audio/sub tracks forward
right-click cycle audio/sub tracks backwards
shift+L-click show available audio/sub tracks
left-click toggle play/pause
============= ================================================
skip back
@ -68,34 +62,17 @@ skip back
shift+L-click show chapters
============= ================================================
seek back
============= ================================================
left-click skip back 5 seconds
right-click skip back 30 seconds
shift-L-click skip back 1 frame
============= ================================================
play
============= ================================================
left-click toggle play/pause
============= ================================================
seek frwd
============= ================================================
left-click skip forward 10 seconds
right-click skip forward 60 seconds
shift-L-click skip forward 1 frame
============= ================================================
skip frwd
============= ================================================
left-click go to next chapter
shift+L-click show chapters
============= ================================================
fullscreen
time elapsed
| Shows current playback position timestamp
============= ================================================
left-click toggle fullscreen
left-click toggle displaying timecodes with milliseconds
============= ================================================
seekbar
@ -105,23 +82,22 @@ seekbar
left-click seek to position
============= ================================================
time passed
| Shows current playback position timestamp
============= ================================================
left-click toggle displaying timecodes with milliseconds
============= ================================================
cache status
| Shows current cache fill status (only visible when below 45%)
time remaining
time left
| Shows remaining playback time timestamp
============= ================================================
left-click toggle between total and remaining time
============= ================================================
audio and sub
| Displays selected track and amount of available tracks
============= ================================================
left-click cycle audio/sub tracks forward
right-click cycle audio/sub tracks backwards
shift+L-click show available audio/sub tracks
============= ================================================
Key Bindings
~~~~~~~~~~~~
@ -176,11 +152,11 @@ Configurable Options
| Enable the OSC when fullscreen
``scalewindowed``
| Default: 1.0
| Default: 1.5
| Scale factor of the OSC when windowed
``scalefullscreen``
| Default: 1.0
| Default: 1.5
| Scale factor of the OSC when fullscreen
``scaleforcedwindow``
@ -214,7 +190,7 @@ Configurable Options
| Duration of fade out in ms, 0 = no fade
``deadzonesize``
| Default: 0
| Default: 1
| Size of the deadzone. The deadzone is an area that makes the mouse act
like leaving the window. Movement there won't make the OSC show up and
it will hide immediately if the mouse enters it. The deadzone starts
@ -222,17 +198,17 @@ Configurable Options
of the window it will span. Values between 0 and 1.
``minmousemove``
| Default: 3
| Default: 0
| Minimum amount of pixels the mouse has to move between ticks to make
the OSC show up
``layout``
| Default: box
| Default: bottombar
| The layout for the OSC. Currently available are: box, slimbox,
bottombar and topbar.
``seekbarstyle``
| Default: slider
| Default: bar
| Sets the style of the seekbar, slider (diamond marker) or bar (fill)
``tooltipborder``

12
player/lua/osc.lua
View File

@ -11,8 +11,8 @@ local opt = require 'mp.options'
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
scalewindowed = 1.5, -- scaling of the controller when windowed
scalefullscreen = 1.5, -- scaling of the controller when fullscreen
scaleforcedwindow = 2, -- scaling when rendered on a forced window
vidscale = true, -- scale the controller with the video?
valign = 0.8, -- vertical alignment, -1 (top) to 1 (bottom)
@ -23,14 +23,14 @@ local user_opts = {
-- mouse movement. enforced non-negative for the
-- user, but internally negative is "always-on".
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
deadzonesize = 1, -- size of deadzone
minmousemove = 0, -- 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 track list management (and some
-- functions that depend on it)
layout = "box",
seekbarstyle = "slider", -- slider (diamond marker) or bar (fill)
layout = "bottombar",
seekbarstyle = "bar", -- slider (diamond marker) or bar (fill)
tooltipborder = 1, -- border of tooltip in bottom/topbar
timetotal = false, -- display total time instead of remaining time?
timems = false, -- display timecodes with milliseconds?