mvp: update uosc to 5.12.0

2 files changed, 19 insertions, 8 deletions

diff --git a/files/.config/mpv/script-opts/uosc.conf b/files/.config/mpv/script-opts/uosc.conf
index 4f7ab3e..b9f1ae7 100644
--- a/files/.config/mpv/script-opts/uosc.conf
+++ b/files/.config/mpv/script-opts/uosc.conf
@@ -14,6 +14,8 @@ timeline_border=1
 timeline_step=5
 # Render cache indicators for streaming content
 timeline_cache=yes
+# Render heatmap for youtube videos. Available: overlay, above, no
+timeline_heatmap=overlay
 
 # 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.
@@ -23,7 +25,7 @@ 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}]`
+# Full item syntax: `[<{dispositions}>]{element}[:{paramN}][#{badge}[>{limit}]][?{tooltip}]`
 # Common properties:
 #   `{icon}` - parameter used to specify an icon name (example: `face`)
 #            - pick here: https://fonts.google.com/icons?icon.platform=web&icon.set=Material+Icons&icon.style=Rounded
@@ -46,7 +48,8 @@ progress_line_width=20
 #           - multiple spaces divide the available space among themselves, which can be used for centering
 #   `button:{name}` - button whose state, look, and click action are managed by external script
 # Item visibility control:
-#   `<[!]{disposition1}[,[!]{dispositionN}]>` - optional prefix to control element's visibility
+#   `<[!]{disposition1}[+[!]{dispositionN}][,{more_dispositions}]>` - optional prefix to control element's visibility
+#   - `+` creates an AND condition, `,` splits into OR groups. Example: `<foo,bar+baz>` -> `foo OR (bar AND baz)`
 #   - `{disposition}` can be one of:
 #     - `idle` - true if mpv is in idle mode (no file loaded)
 #     - `image` - true if current file is a single image
@@ -62,10 +65,11 @@ progress_line_width=20
 #     - `has_chapter` - true for files with chapter list
 #     - `stream` - true if current file is read from a stream
 #     - `has_playlist` - true if current playlist has 2 or more items in it
+#     - `{mpv_prop}` - any mpv property (note: set `user-data/foo` in a script to add custom ones)
 #   - prefix with `!` to negate the required disposition
 #   Examples:
 #     - `<stream>stream-quality` - show stream quality button only for streams
-#     - `<has_audio,!audio>audio` - show audio tracks button for all files that have
+#     - `<has_audio+!audio>audio` - show audio tracks button for all files that have
 #                                   an audio track, but are not exclusively audio only files
 # Place `#{badge}[>{limit}]` after the element params to give it a badge. Available badges:
 #   `sub`, `audio`, `video` - track type counters
@@ -140,21 +144,21 @@ autoload=yes
 shuffle=no
 
 # Scale the interface by this factor
-scale=1.3
+scale=1
 # Scale in fullscreen
 scale_fullscreen=1.3
 # Adjust the text scaling to fit your font
-font_scale=1.5
+font_scale=1
 # 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
+# foreground=ffffff,foreground_text=000000,background=000000,background_text=ffffff,curtain=111111,success=a5e075,error=ff616e,match=69c5ff,heatmap=00adee
 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,controls=0,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,playlist_position=0.8
+# timeline=0.9,position=1,chapters=0.8,slider=0.9,slider_gauge=1,controls=0,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,playlist_position=0.8,heatmap=0.4
 opacity=
 # A comma delimited list of features to refine at a cost of some performance impact.
 # text_width - Use a more accurate text width measurement that measures each text string individually
@@ -195,7 +199,7 @@ subtitle_types=aqt,ass,gsub,idx,jss,lrc,mks,pgs,pjs,psb,rt,sbv,slt,smi,sub,sup,s
 playlist_types=m3u,m3u8,pls,url,cue
 # Type pools used by file navigation and `autoload` to determine what type of file to load next
 # Available: video,audio,image,playlist,same. `same` means the same type pool (not just extension) as currently open file.
-load_types=video,audio
+load_types=video,audio,image
 # Default open-file menu directory. Use `{drives}` to open drives menu on windows (defaults to `/` on unix).
 default_directory=~/Videos
 # List hidden files when reading directories. Due to environment limitations, this currently only hides
@@ -231,8 +235,15 @@ 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
+# By default, subtitles are downloaded into the directory of currently opened file.
+# If the file is being played from a URL, we use this directory instead (expands to `{mpv_config_dir}/subtitles`)
+# Prefix the path with `!` to force all subtitles to be saved there. Example: `!~~/subtitles`
+subtitles_directory=~~/subtitles
 
 # 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=
+
+# List of mpv.conf properties respected by uosc:
+# osd-font, osd-playlist-entry, slang
diff --git a/files/.config/mpv/uosc b/files/.config/mpv/uosc
-Subproject 3df0af21cee3dbdca645ea425a0209bdac6076d
+Subproject 748bb238a962f8aecd0af51ee4b46651b58f6c5