tjh.dev
1diff --git "a/Convert Script \342\200\223 README.md" "b/Convert Script \342\200\223 README.md"
2index 8e062c1..6e0d798 100644
3--- "a/Convert Script \342\200\223 README.md"
4+++ "b/Convert Script \342\200\223 README.md"
5@@ -68,7 +68,7 @@ and set some options in ``mpv/lua-settings/convert_script.conf`` or with ``--scr
6 If you don’t want to upgrade your yad. Features like appending segments won’t be available.
7
8 libvpx_fps
9- Default: --oautofps
10+ Default: ""
11 FPS settings (or any other settings really) for libvpx encoding. Set it to --ofps=24000/1001 for example.
12
13-Warning: Some of these options aren’t very robust and setting them to bogus values will break the script.
14\ No newline at end of file
15+Warning: Some of these options aren’t very robust and setting them to bogus values will break the script.
16diff --git a/convert_script.lua b/convert_script.lua
17index 17d3100..90f88ec 100644
18--- a/convert_script.lua
19+++ b/convert_script.lua
20@@ -3,6 +3,12 @@ local msg = require 'mp.msg'
21 local opt = require 'mp.options'
22 local utils = require 'mp.utils'
23
24+-- executables
25+local mkvpropedit_exe = "mkvpropedit"
26+local mkvmerge_exe = "mkvmerge"
27+local yad_exe = "yad"
28+local notify_send_exe = "notify-send"
29+
30 -- default options, convert_script.conf is read
31 local options = {
32 bitrate_multiplier = 0.975, -- to make sure the file won’t go over the target file size, set it to 1 if you don’t care
33@@ -14,7 +20,7 @@ local options = {
34 libvpx_options = "--ovcopts-add=cpu-used=0,auto-alt-ref=1,lag-in-frames=25,quality=good",
35 libvpx_vp9_options = "",
36 legacy_yad = false, -- if you don’t want to upgrade to at least yad 0.18
37- libvpx_fps = "--oautofps", -- --ofps=24000/1001 for example
38+ libvpx_fps = "", -- --ofps=24000/1001 for example
39 audio_bitrate = 112, -- mpv default, in kbps
40 }
41
42@@ -247,12 +253,12 @@ function encode(enc)
43 if string.len(vf) > 0 then
44 vf = vf .. ","
45 end
46- local sub_file_table = mp.get_property_native("options/sub-file")
47+ local sub_file_table = mp.get_property_native("options/sub-files")
48 local sub_file = ""
49 for index, param in pairs(sub_file_table) do
50 sub_file = sub_file .. " --sub-file='" .. string.gsub(tostring(param), "'", "'\\''") .. "'"
51 end
52- local audio_file_table = mp.get_property_native("options/audio-file")
53+ local audio_file_table = mp.get_property_native("options/audio-files")
54 local audio_file = ""
55 for index, param in pairs(audio_file_table) do
56 audio_file = audio_file .. " --audio-file='" .. string.gsub(tostring(param), "'", "'\\''") .. "'"
57@@ -354,9 +360,9 @@ function encode(enc)
58 if ovc == "gif" then
59 full_command = full_command .. ' --vf-add=lavfi=graph=\\"framestep=' .. framestep .. '\\" && convert '
60 .. tmpfolder .. '/*.png -set delay ' .. delay .. ' -loop 0 -fuzz ' .. fuzz .. '% ' .. dither .. ' -layers optimize '
61- .. full_output_path .. ' && rm -rf ' .. tmpfolder .. ' && notify-send "Gif done") & disown'
62+ .. full_output_path .. ' && rm -rf ' .. tmpfolder .. ' && ' .. notify_send_exe .. ' "Gif done") & disown'
63 else
64- full_command = full_command .. ' && notify-send "Encoding done"; mkvpropedit '
65+ full_command = full_command .. ' && ' .. notify_send_exe .. ' "Encoding done"; ' .. mkvpropedit_exe .. ' '
66 .. full_output_path .. ' -s title="' .. metadata_title .. '") & disown'
67 end
68
69@@ -409,7 +415,7 @@ function encode_copy(enc)
70 sep = ",+"
71
72 if enc then
73- local command = "mkvmerge '" .. video .. "' " .. mkvmerge_parts .. " -o " .. full_output_path
74+ local command = mkvmerge_exe .. " '" .. video .. "' " .. mkvmerge_parts .. " -o " .. full_output_path
75 msg.info(command)
76 os.execute(command)
77 clear()
78@@ -508,7 +514,7 @@ function call_gui ()
79 end
80
81
82- local yad_command = [[LC_NUMERIC=C yad --title="Convert Script" --center --form --fixed --always-print-result \
83+ local yad_command = [[LC_NUMERIC=C ]] .. yad_exe .. [[ --title="Convert Script" --center --form --fixed --always-print-result \
84 --name "convert script" --class "Convert Script" --field="Resize to height:NUM" "]] .. scale_sav --yad_table 1
85 .. [[" --field="Resize to width instead:CHK" ]] .. resize_to_width_instead .. " " --yad_table 2
86 if options.legacy_yad then
87@@ -524,7 +530,7 @@ function call_gui ()
88 yad_command = yad_command
89 .. [[--field="2pass:CHK" "false" ]] --yad_table 5
90 .. [[--field="Encode options::CBE" '! --ovcopts=b=2000,cpu-used=0,auto-alt-ref=1,lag-in-frames=25,quality=good,threads=4' ]] --yad_table 6
91- .. [[--field="Output format::CBE" ' --ovc=libx264! --oautofps --of=webm --ovc=libvpx' ]]
92+ .. [[--field="Output format::CBE" ' --ovc=libx264! --of=webm --ovc=libvpx' ]]
93 .. [[--field="Simple:FBTN" 'bash -c "echo \"simple\" && kill -s SIGUSR1 \"$YAD_PID\""' ]]
94 advanced = true
95 else
96@@ -734,4 +740,4 @@ mp.set_key_bindings({
97
98 mp.add_key_binding("alt+w", "convert_script", convert_script_hotkey_call)
99
100-mp.register_event("tick", tick)
101\ No newline at end of file
102+mp.register_event("tick", tick)