Showing the changes to player/lua/osc.lua (1 of 1 file). Show all
Unified · Split
| @@ -105,28 +105,32 @@ end · 104 unmodified lines | ||
| 105 | 105 | |
| 106 | 106 | -- luacheck: push ignore |
| 107 | 107 | -- luacheck: max line length |
| 108 | −local osc_styles = { | |
| 109 | − bigButtons = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.buttons_color) .. "\\3c&HFFFFFF\\fs50\\fnmpv-osd-symbols}", | |
| 110 | − smallButtonsL = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.small_buttonsL_color) .. "\\3c&HFFFFFF\\fs19\\fnmpv-osd-symbols}", | |
| 111 | − smallButtonsLlabel = "{\\fscx105\\fscy105\\fn" .. mp.get_property("options/osd-font") .. "}", | |
| 112 | − smallButtonsR = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.small_buttonsR_color) .. "\\3c&HFFFFFF\\fs30\\fnmpv-osd-symbols}", | |
| 113 | − topButtons = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.top_buttons_color) .. "\\3c&HFFFFFF\\fs12\\fnmpv-osd-symbols}", | |
| 114 | − | |
| 115 | − elementDown = "{\\1c&H" .. osc_color_convert(user_opts.held_element_color) .."}", | |
| 116 | − timecodes = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.timecode_color) .. "\\3c&HFFFFFF\\fs20}", | |
| 117 | − vidtitle = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.title_color) .. "\\3c&HFFFFFF\\fs12\\q2}", | |
| 118 | − box = "{\\rDefault\\blur0\\bord1\\1c&H" .. osc_color_convert(user_opts.background_color) .. "\\3c&HFFFFFF}", | |
| 119 | − | |
| 120 | − topButtonsBar = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.top_buttons_color) .. "\\3c&HFFFFFF\\fs18\\fnmpv-osd-symbols}", | |
| 121 | − smallButtonsBar = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.buttons_color) .. "\\3c&HFFFFFF\\fs28\\fnmpv-osd-symbols}", | |
| 122 | − timecodesBar = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.timecode_color) .."\\3c&HFFFFFF\\fs27}", | |
| 123 | − timePosBar = "{\\blur0\\bord".. user_opts.tooltipborder .."\\1c&H" .. osc_color_convert(user_opts.time_pos_color) .. "\\3c&H" .. osc_color_convert(user_opts.time_pos_outline_color) .. "\\fs30}", | |
| 124 | − vidtitleBar = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.title_color) .. "\\3c&HFFFFFF\\fs18\\q2}", | |
| 125 | − | |
| 126 | − wcButtons = "{\\1c&H" .. osc_color_convert(user_opts.buttons_color) .. "\\fs24\\fnmpv-osd-symbols}", | |
| 127 | − wcTitle = "{\\1c&H" .. osc_color_convert(user_opts.title_color) .. "\\fs24\\q2}", | |
| 128 | − wcBar = "{\\1c&H" .. osc_color_convert(user_opts.background_color) .. "}", | |
| 129 | −} | |
| 108 | +local osc_styles | |
| 109 | + | |
| 110 | +local function set_osc_styles() | |
| 111 | + osc_styles = { | |
| 112 | + bigButtons = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.buttons_color) .. "\\3c&HFFFFFF\\fs50\\fnmpv-osd-symbols}", | |
| 113 | + smallButtonsL = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.small_buttonsL_color) .. "\\3c&HFFFFFF\\fs19\\fnmpv-osd-symbols}", | |
| 114 | + smallButtonsLlabel = "{\\fscx105\\fscy105\\fn" .. mp.get_property("options/osd-font") .. "}", | |
| 115 | + smallButtonsR = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.small_buttonsR_color) .. "\\3c&HFFFFFF\\fs30\\fnmpv-osd-symbols}", | |
| 116 | + topButtons = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.top_buttons_color) .. "\\3c&HFFFFFF\\fs12\\fnmpv-osd-symbols}", | |
| 117 | + | |
| 118 | + elementDown = "{\\1c&H" .. osc_color_convert(user_opts.held_element_color) .."}", | |
| 119 | + timecodes = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.timecode_color) .. "\\3c&HFFFFFF\\fs20}", | |
| 120 | + vidtitle = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.title_color) .. "\\3c&HFFFFFF\\fs12\\q2}", | |
| 121 | + box = "{\\rDefault\\blur0\\bord1\\1c&H" .. osc_color_convert(user_opts.background_color) .. "\\3c&HFFFFFF}", | |
| 122 | + | |
| 123 | + topButtonsBar = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.top_buttons_color) .. "\\3c&HFFFFFF\\fs18\\fnmpv-osd-symbols}", | |
| 124 | + smallButtonsBar = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.buttons_color) .. "\\3c&HFFFFFF\\fs28\\fnmpv-osd-symbols}", | |
| 125 | + timecodesBar = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.timecode_color) .."\\3c&HFFFFFF\\fs27}", | |
| 126 | + timePosBar = "{\\blur0\\bord".. user_opts.tooltipborder .."\\1c&H" .. osc_color_convert(user_opts.time_pos_color) .. "\\3c&H" .. osc_color_convert(user_opts.time_pos_outline_color) .. "\\fs30}", | |
| 127 | + vidtitleBar = "{\\blur0\\bord0\\1c&H" .. osc_color_convert(user_opts.title_color) .. "\\3c&HFFFFFF\\fs18\\q2}", | |
| 128 | + | |
| 129 | + wcButtons = "{\\1c&H" .. osc_color_convert(user_opts.buttons_color) .. "\\fs24\\fnmpv-osd-symbols}", | |
| 130 | + wcTitle = "{\\1c&H" .. osc_color_convert(user_opts.title_color) .. "\\fs24\\q2}", | |
| 131 | + wcBar = "{\\1c&H" .. osc_color_convert(user_opts.background_color) .. "}", | |
| 132 | + } | |
| 133 | +end | |
| 130 | 134 | |
| 131 | 135 | -- internal states, do not touch |
| 132 | 136 | local state = { |
| @@ -2970,6 +2974,7 @@ end · 2837 unmodified lines | ||
| 2970 | 2974 | -- read options from config and command-line |
| 2971 | 2975 | opt.read_options(user_opts, "osc", function() |
| 2972 | 2976 | validate_user_opts() |
| 2977 | + set_osc_styles() | |
| 2973 | 2978 | request_tick() |
| 2974 | 2979 | visibility_mode(user_opts.visibility, true) |
| 2975 | 2980 | update_duration_watch() |
| @@ -2977,6 +2982,7 @@ opt.read_options(user_opts, "osc", function() · 1 unmodified line | ||
| 2977 | 2982 | end) |
| 2978 | 2983 | |
| 2979 | 2984 | validate_user_opts() |
| 2985 | +set_osc_styles() | |
| 2980 | 2986 | visibility_mode(user_opts.visibility, true) |
| 2981 | 2987 | update_duration_watch() |
| 2982 | 2988 | |