Skip to content

Commit

Permalink
settings: fix extremely bad cache bar defaults
Browse files Browse the repository at this point in the history
I think this has been broken since the cache bar was split into
foreground and background components (and I had a bad half-height
cache bar in the defaults even before that for some insane reason). I
think these changes provide a much more reasonable out-of-the-box
experience (what can I say, they match my local configuration now).
  • Loading branch information
torque committed Nov 4, 2023
1 parent 77135c4 commit fe897fd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
7 changes: 4 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ convenient to update if you symlink it in from somewhere else.
the way it displays. These can be set on the mpv command line, but the
recommended approach is by using the configuration file
`~~/script-opts/torque-progressbar/main.conf`, where `~~` is either
`~/.mpv` or `~/.config/mpv`, depending on your setup. The defaults are
provided in `settings.moon`, and are reproduced in config-file-
compatible syntax in [`torque-progressbar.conf`][conf-example].
`~/.mpv` or `~/.config/mpv`, depending on your setup (on Windows, it's
`%appdata%\mpv`). The defaults are provided in `settings.moon`, and are
reproduced in config-file- compatible syntax in
[`torque-progressbar.conf`][conf-example].

#### Keybindings

Expand Down
8 changes: 4 additions & 4 deletions src/settings.moon
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ demuxer cache ranges that are prior to the current playback point will not be
shown. This matches the previous behavior.
]]

settings['bar-cache-height-inactive'] = 1.5
settings['bar-cache-height-inactive'] = 3
helpText['bar-cache-height-inactive'] = [[
Sets the height of the cache bar display when the mouse is not in the active
zone and there is no request-display active. Useful in combination with bar-
cache-position to control whether or not the cache bar is occluded by (or
occludes) the progress bar.
]]

settings['bar-cache-height-active'] = 4
settings['bar-cache-height-active'] = 8
helpText['bar-cache-height-active'] = [[
Sets the height of the cache bar display when the mouse is in the active zone or
request-display is active. Useful in combination with bar-cache- position to
Expand All @@ -139,14 +139,14 @@ A string of ASS override tags that get applied only to the progress layer of the
bar.
]]

settings['bar-cache-style'] = [[\c&H515151&]]
settings['bar-cache-style'] = [[\c&HFDAFC8&]]
helpText['bar-cache-style'] = [[
A string of ASS override tags that get applied only to the cache layer of the
bar, particularly the part of the cache bar that is behind the current playback
position. The default sets only the color.
]]

settings['bar-cache-background-style'] = [[]]
settings['bar-cache-background-style'] = [[\c&H525252&]]
helpText['bar-cache-background-style'] = [[
A string of ASS override tags that get applied only to the cache layer of the
bar, particularly the part of the cache bar that is after the current playback
Expand Down
8 changes: 4 additions & 4 deletions torque-progressbar.conf
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@ bar-cache-position=overlay
# zone and there is no request-display active. Useful in combination with bar-
# cache-position to control whether or not the cache bar is occluded by (or
# occludes) the progress bar.
bar-cache-height-inactive=1.5
bar-cache-height-inactive=3

# Sets the height of the cache bar display when the mouse is in the active zone or
# request-display is active. Useful in combination with bar-cache- position to
# control whether or not the cache bar is occluded by (or occludes) the progress
# bar.
bar-cache-height-active=4
bar-cache-height-active=8

# A string of ASS override tags that get applied to all three layers of the bar:
# progress, cache, and background. You probably don't want to remove \bord0 unless
Expand All @@ -109,15 +109,15 @@ bar-foreground-style=
# A string of ASS override tags that get applied only to the cache layer of the
# bar, particularly the part of the cache bar that is behind the current playback
# position. The default sets only the color.
bar-cache-style=\c&H515151&
bar-cache-style=\c&HFDAFC8&

# A string of ASS override tags that get applied only to the cache layer of the
# bar, particularly the part of the cache bar that is after the current playback
# position. The tags specified here are applied after bar-cache-style and override
# them. Leaving this blank will leave the style the same as specified by bar-
# cache-style. The split does not account for a nonzero progress-bar-width and may
# look odd when used in tandem with that setting.
bar-cache-background-style=
bar-cache-background-style=\c&H525252&

# A string of ASS override tags that get applied only to the background layer of
# the bar. The default sets only the color.
Expand Down

0 comments on commit fe897fd

Please sign in to comment.