ardour/livetrax
13
0
Fork 0
Code

assert(rv) removed, fixed redundant checking, and fixed proc ordering issue caused by commit c7f7347

Browse Source
This commit is contained in:
Nikolaus Gullotta 2018-03-23 09:00:51 -05:00
parent c7f7347822
commit 4e04da667c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/_store_recall_mixer.lua
View File

@ -107,7 +107,7 @@ function factory() return function()
if plug:parameter_is_input (j) and label ~= "hidden" and label:sub (1,1) ~= "#" then if plug:parameter_is_input (j) and label ~= "hidden" and label:sub (1,1) ~= "#" then
local _, _, pd = ARDOUR.LuaAPI.plugin_automation(proc, n) local _, _, pd = ARDOUR.LuaAPI.plugin_automation(proc, n)
local val = ARDOUR.LuaAPI.get_processor_param(proc, j, true) local val = ARDOUR.LuaAPI.get_processor_param(proc, j, true)
print(proc:display_name(), label, val) --print(r:name(), "->", proc:display_name(), label, val)
params[n] = val params[n] = val
end end
n = n + 1 n = n + 1
@ -164,10 +164,11 @@ function factory() return function()
local rt = Session:route_by_id(r_id) local rt = Session:route_by_id(r_id)
if rt:isnil() then goto nextline end if rt:isnil() then goto nextline end
local cur_group_id = route_group_interrogate(rt) local cur_group_id = route_group_interrogate(rt)
if not(group) and (cur_group_id ~= false) then if not(group) and (cur_group_id) then
local g = group_by_id(cur_group_id) local g = group_by_id(cur_group_id)
if g ~= nil then g:remove(rt) end if g then g:remove(rt) end
end end
for k, v in pairs(order) do for k, v in pairs(order) do
@ -179,11 +180,11 @@ function factory() return function()
if not(proc:isnil()) then if not(proc:isnil()) then
rt:add_processor_by_index(proc, 0, nil, true) rt:add_processor_by_index(proc, 0, nil, true)
invalidate[v] = proc:to_stateful():id():to_s() invalidate[v] = proc:to_stateful():id():to_s()
old_order:push_back(proc)
end end
end end
end end
end end
if not(proc:isnil()) then old_order:push_back(proc) end
end end
if muted then rt:mute_control():set_value(1, 1) else rt:mute_control():set_value(0, 1) end if muted then rt:mute_control():set_value(1, 1) else rt:mute_control():set_value(0, 1) end
@ -234,9 +235,10 @@ function factory() return function()
} }
local rv = LuaDialog.Dialog("Mixer Store:", dialog_options):run() local rv = LuaDialog.Dialog("Mixer Store:", dialog_options):run()
assert(rv, 'Dialog box was canceled or is ' .. type(rv)) if rv then
local c = rv["select"] local c = rv["select"]
if c == "mark" then mark() end if c == "mark" then mark() end
if c == "recall" then recall() end if c == "recall" then recall() end
end
end end end end