[mpv] Update uosc script

4 files changed, 61 insertions, 56 deletions

diff --git a/files/.config/mpv/fonts b/files/.config/mpv/fonts
index 883f8c8..04feac6 120000
--- a/files/.config/mpv/fonts
+++ b/files/.config/mpv/fonts
@@ -1 +1 @@
-uosc/fonts
\ No newline at end of file
+uosc/src/fonts
\ No newline at end of file
diff --git a/files/.config/mpv/script-opts/uosc.conf b/files/.config/mpv/script-opts/uosc.conf
index af15b4b..787d8b4 100644
--- a/files/.config/mpv/script-opts/uosc.conf
+++ b/files/.config/mpv/script-opts/uosc.conf
@@ -2,53 +2,45 @@
 timeline_style=line
 # Line display style config
 timeline_line_width=2
-timeline_line_width_fullscreen=3
-# Scale the width of the line when minimized (timeline_size_min)
-timeline_line_width_minimized_scale=10
-# Timeline size when minimized, 0 will hide it completely
-timeline_size_min=2
 # Timeline size when fully expanded, in pixels, 0 to disable
-timeline_size_max=40
-# Same as ^ but when in fullscreen
-timeline_size_min_fullscreen=0
-timeline_size_max_fullscreen=60
-# Same thing as calling toggle-progress command once on startup
-timeline_start_hidden=no
-# Comma separated states when timeline should always be visible. available: paused, audio, image, video, idle
+timeline_size=40
+# Comma separated states when element should always be fully visible.
+# Available: paused, audio, image, video, idle, windowed, fullscreen
 timeline_persistency=paused
-# Timeline opacity
-timeline_opacity=0.9
 # Top border of background color to help visually separate timeline from video
 timeline_border=1
 # When scrolling above timeline, wheel will seek by this amount of seconds
 timeline_step=5
-# Opacity of chapter indicators in timeline, 0 to disable
-timeline_chapters_opacity=0.8
 # Render cache indicators for streaming content
 timeline_cache=yes
 
-# A comma delimited list of items to construct the controls bar above the timeline. Set to `never` to disable.
+# When to display an always visible progress bar (minimized timeline). Can be: windowed, fullscreen, always, never
+# Can also be toggled on demand with `toggle-progress` command.
+progress=windowed
+progress_size=2
+progress_line_width=20
+
+# A comma delimited list of controls above the timeline. Set to `never` to disable.
 # Parameter spec: enclosed in `{}` means value, enclosed in `[]` means optional
 # Full item syntax: `[<[!]{disposition1}[,[!]{dispositionN}]>]{element}[:{paramN}][#{badge}[>{limit}]][?{tooltip}]`
 # Common properties:
 #   `{icon}` - parameter used to specify an icon name (example: `face`)
-#            - you can pick one here: https://fonts.google.com/icons?selected=Material+Icons&icon.style=Rounded
+#            - pick here: https://fonts.google.com/icons?icon.platform=web&icon.set=Material+Icons&icon.style=Rounded
 # `{element}`s and their parameters:
-#   `{usoc_command}` - preconfigured shorthands for uosc commands that make sense to have as buttons:
-#      - `menu`, `subtitles`, `audio`, `video`, `playlist`, `chapters`, `editions`, `stream-quality`,
-#        `open-file`, `items`, `next`, `prev`, `first`, `last`, `audio-device`
-#   `fullscreen` - toggle fullscreen
-#   `loop-playlist` - button to toggle playlist looping
-#   `loop-file` - button to toggle current file looping
-#   `shuffle` - toggle for uosc's shuffle mode
+#   `{shorthand}` - preconfigured shorthands:
+#        `play-pause`, `menu`, `subtitles`, `audio`, `video`, `playlist`,
+#        `chapters`, `editions`, `stream-quality`, `open-file`, `items`,
+#        `next`, `prev`, `first`, `last`, `audio-device`, `fullscreen`,
+#        `loop-playlist`, `loop-file`, `shuffle`
 #   `speed[:{scale}]` - display speed slider, [{scale}] - factor of controls_size, default: 1.3
 #   `command:{icon}:{command}` - button that executes a {command} when pressed
 #   `toggle:{icon}:{prop}[@{owner}]` - button that toggles mpv property
 #   `cycle:{default_icon}:{prop}[@{owner}]:{value1}[={icon1}][!]/{valueN}[={iconN}][!]`
-#     - button that cycles mpv property between values, each optionally having different icon and active flag
-#     - presence of `!` at the end will style the button as active
-#     - `{owner}` is the name of a script that manages this property if any
-#   `gap[:{scale}]` - display an empty gap, {scale} - factor of controls_size, default: 0.3
+#       - button that cycles mpv property between values, each optionally having different icon and active flag
+#       - presence of `!` at the end will style the button as active
+#       - `{owner}` is the name of a script that manages this property if any
+#   `gap[:{scale}]` - display an empty gap
+#       {scale} - factor of controls_size, default: 0.3
 #   `space` - fills all available space between previous and next item, useful to align items to the right
 #           - multiple spaces divide the available space among themselves, which can be used for centering
 # Item visibility control:
@@ -59,6 +51,7 @@ timeline_cache=yes
 #     - `audio` - true for audio only files
 #     - `video` - true for files with a video track
 #     - `has_many_video` - true for files with more than one video track
+#     - `has_image` - true for files with a cover or other image track
 #     - `has_audio` - true for files with an audio track
 #     - `has_many_audio` - true for files with more than one audio track
 #     - `has_sub` - true for files with an subtitle track
@@ -79,8 +72,7 @@ timeline_cache=yes
 #   `>{limit}` will display the badge only if it's numerical value is above this threshold.
 #   Example: `#audio>1`
 # Place `?{tooltip}` after the element config to give it a tooltip.
-#   Example: `<stream>stream-quality?Stream quality`
-# Example implementations of some of the available shorthands:
+# Example implementations:
 #   menu = command:menu:script-binding uosc/menu-blurred?Menu
 #   subtitles = command:subtitles:script-binding uosc/subtitles#sub?Subtitles
 #   fullscreen = cycle:crop_free:fullscreen:no/yes=fullscreen_exit!?Fullscreen
@@ -88,7 +80,6 @@ timeline_cache=yes
 #   toggle:{icon}:{prop} = cycle:{icon}:{prop}:no/yes!
 controls=menu,gap,<has_chapter>chapters,<has_many_sub>subtitles,<has_many_audio>audio,<has_many_video>video,<has_many_edition>editions,<stream>stream-quality,gap,space,prev,items,next,gap
 controls_size=32
-controls_size_fullscreen=40
 controls_margin=8
 controls_spacing=2
 controls_persistency=
@@ -96,31 +87,28 @@ controls_persistency=
 # Where to display volume controls: none, left, right
 volume=none
 volume_size=40
-volume_size_fullscreen=52
-volume_opacity=0.9
 volume_border=1
 volume_step=1
 volume_persistency=
 
 # Playback speed widget: mouse drag or wheel to change, click to reset
-speed_opacity=0.6
 speed_step=0.1
 speed_step_is_factor=no
 speed_persistency=
 
 # Controls all menus, such as context menu, subtitle loader/selector, etc
 menu_item_height=36
-menu_item_height_fullscreen=50
 menu_min_width=260
-menu_min_width_fullscreen=360
-menu_opacity=0.8
-menu_parent_opacity=0.4
+menu_padding=4
+# Determines if `/` or `ctrl+f` is required to activate the search, or if typing
+# any text is sufficient.
+# When enabled, you can no longer toggle a menu off with the same key that opened it, if the key is a unicode character.
+menu_type_to_search=yes
 
 # Top bar with window controls and media title
 # Can be: never, no-border, always
 top_bar=no-border
 top_bar_size=40
-top_bar_size_fullscreen=46
 top_bar_controls=no
 # Can be: `no` (hide), `yes` (inherit title from mpv.conf), or a custom template string
 top_bar_title=yes
@@ -132,12 +120,12 @@ top_bar_alt_title=
 #   `toggle` => toggle the top bar title text between main and alt by clicking
 #               the top bar, or calling `toggle-title` binding
 top_bar_alt_title_place=below
-top_bar_title_opacity=0.8
+# Flash top bar when any of these file types is loaded. Available: audio,image,video
+top_bar_flash_on=video,audio
 top_bar_persistency=
 
 # Window border drawn in no-border mode
 window_border_size=1
-window_border_opacity=0.8
 
 # If there's no playlist and file ends, load next file in the directory
 # Requires `keep-open=yes` in `mpv.conf`.
@@ -151,14 +139,30 @@ autoload_types=video,audio,image
 shuffle=no
 
 # Scale the interface by this factor
-ui_scale=1.3
+scale=1.3
+# Scale in fullscreen
+scale_fullscreen=1.3
 # Adjust the text scaling to fit your font
 font_scale=1.5
 # Border of text and icons when drawn directly on top of video
 text_border=1.2
+# Border radius of buttons, menus, and all other rectangles
+border_radius=4
+# A comma delimited list of color overrides in RGB HEX format.
+# Defaults: foreground=ffffff,foreground_text=000000,background=000000,background_text=ffffff,curtain=111111,
+#           success=a5e075,error=ff616e
+color=
+# A comma delimited list of opacity overrides for various UI element backgrounds and shapes.
+# This does not affect any text, which is always rendered fully opaque.
+# Defaults: timeline=0.9,position=1,chapters=0.8,slider=0.9,slider_gauge=1,speed=0.6,menu=1,submenu=0.4,
+#           border=1,title=1,tooltip=1,thumbnail=1,curtain=0.8,idle_indicator=0.8,audio_indicator=0.5,
+#           buffering_indicator=0.3
+opacity=
 # Use a faster estimation method instead of accurate measurement
 # setting this to `no` might have a noticeable impact on performance, especially in large menus.
 text_width_estimation=yes
+# Duration of animations in milliseconds
+animation_duration=100
 # Execute command for background clicks shorter than this number of milliseconds, 0 to disable
 # Execution always waits for `input-doubleclick-time` to filter out double-clicks
 click_threshold=0
@@ -168,11 +172,6 @@ flash_duration=1000
 # Distances in pixels below which elements are fully faded in/out
 proximity_in=40
 proximity_out=120
-# RGB HEX color codes
-foreground=ffffff
-foreground_text=000000
-background=000000
-background_text=ffffff
 # Use only bold font weight throughout the whole UI
 font_bold=no
 # One of `total`, `playtime-remaining` (scaled by the current speed), `time-remaining` (remaining length of file)
@@ -183,19 +182,20 @@ time_precision=0
 buffered_time_threshold=60
 # Hide UI when mpv autohides the cursor
 autohide=no
-# Can be: none, flash, static, manual (controlled by flash-pause-indicator and decide-pause-indicator commands)
-pause_indicator=none
-# Screen dim when stuff like menu is open, 0 to disable
-curtain_opacity=0.5
+# Can be: flash, static, manual (controlled by flash-pause-indicator and decide-pause-indicator commands)
+pause_indicator=flash
 # Sizes to list in stream quality menu
 stream_quality_options=4320,2160,1440,1080,720,480,360,240,144
 # Types to identify media files
 video_types=3g2,3gp,asf,avi,f4v,flv,h264,h265,m2ts,m4v,mkv,mov,mp4,mp4v,mpeg,mpg,ogm,ogv,rm,rmvb,ts,vob,webm,wmv,y4m
-audio_types=aac,ac3,aiff,ape,au,dsf,dts,flac,m4a,mid,midi,mka,mp3,mp4a,oga,ogg,opus,spx,tak,tta,wav,weba,wma,wv
+audio_types=aac,ac3,aiff,ape,au,cue,dsf,dts,flac,m4a,mid,midi,mka,mp3,mp4a,oga,ogg,opus,spx,tak,tta,wav,weba,wma,wv
 image_types=apng,avif,bmp,gif,j2k,jp2,jfif,jpeg,jpg,jxl,mj2,png,svg,tga,tif,tiff,webp
-subtitle_types=aqt,ass,gsub,idx,jss,lrc,mks,pgs,pjs,psb,rt,slt,smi,sub,sup,srt,ssa,ssf,ttxt,txt,usf,vt,vtt
+subtitle_types=aqt,ass,gsub,idx,jss,lrc,mks,pgs,pjs,psb,rt,sbv,slt,smi,sub,sup,srt,ssa,ssf,ttxt,txt,usf,vt,vtt
 # Default open-file menu directory
 default_directory=~/Videos
+# List hidden files when reading directories. Due to environment limitations, this currently only hides
+# files starting with a dot. Doesn't hide hidden files on windows (we have no way to tell they're hidden).
+show_hidden_files=no
 # Move files to trash (recycle bin) when deleting files. Dependencies:
 # - Linux: `sudo apt install trash-cli`
 # - MacOS: `brew install trash`
@@ -225,3 +225,8 @@ chapter_range_patterns=openings:オープニング;endings:エンディング
 # `slang` is a keyword to inherit values from `--slang` mpv config.
 # Supports paths to custom json files: `languages=~~/custom.json,slang,en`
 languages=slang,en
+
+# A comma separated list of element IDs to disable. Available IDs:
+#   window_border, top_bar, timeline, controls, volume,
+#   idle_indicator, audio_indicator, buffering_indicator, pause_indicator
+disable_elements=
diff --git a/files/.config/mpv/scripts/uosc b/files/.config/mpv/scripts/uosc
index f9a5194..5ed3a25 120000
--- a/files/.config/mpv/scripts/uosc
+++ b/files/.config/mpv/scripts/uosc
@@ -1 +1 @@
-../uosc/scripts/uosc/
\ No newline at end of file
+../uosc/src/uosc
\ No newline at end of file
diff --git a/files/.config/mpv/uosc b/files/.config/mpv/uosc
-Subproject e897089f619fa7058ace301db13c84352b27a5f
+Subproject b8280b0004c242172f7811b6a263a20145fff38