From f14464b493bd64666c490e9d2ec5fa75d6f23a49 Mon Sep 17 00:00:00 2001 From: Tomas Sardyha Date: Thu, 2 Apr 2020 14:39:48 +0200 Subject: [PATCH] Fix config examples not working when comments are on the same line --- README.md | 46 +++++++++++++++++++++++++++++++++------------- uosc.conf | 40 ++++++++++++++++++++++++++++++---------- uosc.lua | 39 ++++++++++++++++++++++++++------------- 3 files changed, 89 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 0e90cf6..d79122b 100644 --- a/README.md +++ b/README.md @@ -30,20 +30,40 @@ To configure **uosc**, create a `script-opts/uosc.conf` file, or download [`uosc All available options with their default values: ```conf -title=no # display window title (filename) in no-border mode -progressbar_size=4 # progressbar size in pixels, 0 to disable -progressbar_size_fullscreen=4 # same as ^ but when in fullscreen -seekbar_size=40 # seekbar size in pixels, 0 to disable -seekbar_size_fullscreen=40 # same as ^ but when in fullscreen -min_proximity=60 # proximity below which opacity equals 1 -max_proximity=120 # proximity above which opacity equals 0 -bar_opacity=0.8 # max opacity of progress and seek bars -bar_color_foreground=FFFFFF # BBGGRR - BLUE GREEN RED hex code -bar_color_background=000000 # BBGGRR - BLUE GREEN RED hex code +# display window title (filename) in no-border mode +title=no + +# seekbar size in pixels, 0 to disable +seekbar_size=40 +# same as ^ but when in fullscreen +seekbar_size_fullscreen=40 +# seekbar chapters style: dots, lines, lines-top, lines-bottom +seekbar_chapters= + +# progressbar size in pixels, 0 to disable +progressbar_size=4 +# same as ^ but when in fullscreen +progressbar_size_fullscreen=4 +# progressbar chapters style: lines, lines-top, lines-bottom +progressbar_chapters= + +# proximity below which opacity equals 1 +min_proximity=40 +# proximity above which opacity equals 0 +max_proximity=120 +# max opacity of progress and seek bars +bar_opacity=0.8 +# chapters indicator opacity +chapters_opacity=0.2 +# BBGGRR - BLUE GREEN RED hex code +bar_color_foreground=FFFFFF +# BBGGRR - BLUE GREEN RED hex code +bar_color_background=000000 ``` -**Progressbar**: thin always visible discrete video progress bar. -**Seekbar**: thick seeking bar with times that appears when mouse is near it. +Terminology: +- **Seekbar**: thick seeking bar with times that appears when mouse is near it +- **Progressbar**: thin persistent video progress bar ## Keybindings @@ -72,4 +92,4 @@ interpolation=yes video-sync=display-resample ``` -Though it does come at the cost of a higher CPU load. \ No newline at end of file +Though it does come at the cost of a higher CPU load. diff --git a/uosc.conf b/uosc.conf index 7940227..fbfda18 100644 --- a/uosc.conf +++ b/uosc.conf @@ -1,10 +1,30 @@ -title=no # display window title (filename) in no-border mode -progressbar_size=4 # progressbar size in pixels, 0 to disable -progressbar_size_fullscreen=4 # same as ^ but when in fullscreen -seekbar_size=40 # seekbar size in pixels, 0 to disable -seekbar_size_fullscreen=40 # same as ^ but when in fullscreen -min_proximity=40 # proximity below which opacity equals 1 -max_proximity=120 # proximity above which opacity equals 0 -bar_opacity=0.8 # max opacity of progress and seek bars -bar_color_foreground=FFFFFF # BBGGRR - BLUE GREEN RED hex code -bar_color_background=000000 # BBGGRR - BLUE GREEN RED hex code \ No newline at end of file + +# display window title (filename) in no-border mode +title=no + +# seekbar size in pixels, 0 to disable +seekbar_size=40 +# same as ^ but when in fullscreen +seekbar_size_fullscreen=40 +# seekbar chapters style: dots, lines, lines-top, lines-bottom +seekbar_chapters= + +# progressbar size in pixels, 0 to disable +progressbar_size=4 +# same as ^ but when in fullscreen +progressbar_size_fullscreen=4 +# progressbar chapters style: lines, lines-top, lines-bottom +progressbar_chapters= + +# proximity below which opacity equals 1 +min_proximity=40 +# proximity above which opacity equals 0 +max_proximity=120 +# max opacity of progress and seek bars +bar_opacity=0.8 +# chapters indicator opacity +chapters_opacity=0.2 +# BBGGRR - BLUE GREEN RED hex code +bar_color_foreground=FFFFFF +# BBGGRR - BLUE GREEN RED hex code +bar_color_background=000000 diff --git a/uosc.lua b/uosc.lua index b97a8e3..fff1a4e 100644 --- a/uosc.lua +++ b/uosc.lua @@ -16,22 +16,35 @@ border=no # if you disable window border, uosc will draw Options go in `script-opts/uosc.conf`. Defaults: ``` -title=no # display window title (filename) in no-border mode +# display window title (filename) in no-border mode +title=no -seekbar_size=40 # seekbar size in pixels, 0 to disable -seekbar_size_fullscreen=40 # same as ^ but when in fullscreen -seekbar_chapters= # seekbar chapters style: dots, lines, lines-top, lines-bottom +# seekbar size in pixels, 0 to disable +seekbar_size=40 +# same as ^ but when in fullscreen +seekbar_size_fullscreen=40 +# seekbar chapters style: dots, lines, lines-top, lines-bottom +seekbar_chapters= -progressbar_size=4 # progressbar size in pixels, 0 to disable -progressbar_size_fullscreen=4 # same as ^ but when in fullscreen -progressbar_chapters= # progressbar chapters style: lines, lines-top, lines-bottom +# progressbar size in pixels, 0 to disable +progressbar_size=4 +# same as ^ but when in fullscreen +progressbar_size_fullscreen=4 +# progressbar chapters style: lines, lines-top, lines-bottom +progressbar_chapters= -min_proximity=40 # proximity below which opacity equals 1 -max_proximity=120 # proximity above which opacity equals 0 -bar_opacity=0.8 # max opacity of progress and seek bars -chapters_opacity=0.2 # chapters indicator opacity -bar_color_foreground=FFFFFF # BBGGRR - BLUE GREEN RED hex code -bar_color_background=000000 # BBGGRR - BLUE GREEN RED hex code +# proximity below which opacity equals 1 +min_proximity=40 +# proximity above which opacity equals 0 +max_proximity=120 +# max opacity of progress and seek bars +bar_opacity=0.8 +# chapters indicator opacity +chapters_opacity=0.2 +# BBGGRR - BLUE GREEN RED hex code +bar_color_foreground=FFFFFF +# BBGGRR - BLUE GREEN RED hex code +bar_color_background=000000 ``` Available keybindings (place into `input.conf`):