From: Nikolaus Gullotta Date: Wed, 14 Mar 2018 14:58:56 +0000 (-0500) Subject: re-add plugin bypass state and move proc order writing closer to top X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=51a0a2f74c646c07124b26d2892913a630d0dd26;p=ardour.git re-add plugin bypass state and move proc order writing closer to top --- diff --git a/scripts/_store_recall_mixer.lua b/scripts/_store_recall_mixer.lua index 0d20cfb1e1..fc2eeef673 100644 --- a/scripts/_store_recall_mixer.lua +++ b/scripts/_store_recall_mixer.lua @@ -10,7 +10,7 @@ function factory() return function() local path = ARDOUR.LuaAPI.build_filename(Session:path(), "export", "params.lua") function mark() local file = io.open(path, "w") - file:write("") --empty curent file from last run + file:write("") --empty current file from last run file:close() for r in Session:get_routes():iter() do if r:is_monitor () or r:is_auditioner () then goto nextroute end -- skip special routes @@ -19,21 +19,38 @@ function factory() return function() local x = 0 repeat local proc = r:nth_processor(x) - if not proc:isnil () then + if not proc:isnil() then order:push_back(proc) end x = x + 1 - until proc:isnil () + until proc:isnil() + + local route_str, proc_order_str = "", "" + local rid = r:to_stateful():id():to_s() + local pan = r:pan_azimuth_control() + if pan:isnil() then pan = false else pan = pan:get_value() end --sometimes a route doesn't have pan, like the master. + + local on = 0 + for p in order:iter() do + local pid = p:to_stateful():id():to_s() + proc_order_str = proc_order_str .. "[" .. on .. "] = " .. pid .."," + on = on + 1 + end - local i = 0 - while true do - local params = {} - local proc_str, params_str = "", "" - local proc = r:nth_plugin (i) - if proc:isnil () then break end - local active = proc:active() - local id = proc:to_stateful():id():to_s() - local plug = proc:to_insert ():plugin (0) + route_str = "instance = {route_id = " .. rid .. ", gain_control = " .. r:gain_control():get_value() .. ", trim_control = " .. r:trim_control():get_value() .. ", pan_control = " .. tostring(pan) .. ", order = {" .. proc_order_str .."}" .. "}" + file = io.open(path, "a") + file:write(route_str, "\r\n") + file:close() + + local i = 0 + while true do + local params = {} + local proc_str, params_str = "", "" + local proc = r:nth_plugin (i) + if proc:isnil () then break end + local active = proc:active() + local id = proc:to_stateful():id():to_s() + local plug = proc:to_insert ():plugin (0) local n = 0 -- count control-ports for j = 0, plug:parameter_count () - 1 do -- iterate over all plugin parameters if plug:parameter_is_control (j) then @@ -49,33 +66,15 @@ function factory() return function() end end i = i + 1 - for k, v in pairs(params) do - params_str = params_str .. "[".. k .."] = " .. v .. "," + for k, v in pairs(params) do + params_str = params_str .. "[".. k .."] = " .. v .. "," + end + proc_str = "instance = {plugin_id = " .. id .. ", parameters = {" .. params_str .. "}, active = " .. tostring(active) .. "}" + file = io.open(path, "a") + file:write(proc_str, "\r\n") + file:close() end - proc_str = "instance = {plugin_id = " .. id .. ", parameters = {" .. params_str .. "}, active = " .. tostring(active) .. "}" - file = io.open(path, "a") - file:write(proc_str, "\r\n") - file:close() - end - - local route_str, proc_order_str = "", "" - local rid = r:to_stateful():id():to_s() - local pan = r:pan_azimuth_control() - if pan:isnil() then pan = false else pan = pan:get_value() end --sometimes a route doesn't have pan, like the master. - - local on = 0 - for p in order:iter() do - local pid = p:to_stateful():id():to_s() - proc_order_str = proc_order_str .. "[" .. on .. "] = " .. pid .."," - on = on + 1 - end - - route_str = "instance = {route_id = " .. rid .. ", gain_control = " .. r:gain_control():get_value() .. ", trim_control = " .. r:trim_control():get_value() .. ", pan_control = " .. tostring(pan) .. ", order = {" .. proc_order_str .."}" .. "}" - file = io.open(path, "a") - file:write(route_str, "\r\n") - file:close() - ::nextroute:: - + ::nextroute:: end end @@ -84,51 +83,52 @@ function factory() return function() assert(file, "File not found!") for l in file:lines() do - local plugin, route = false, false - local f = load(l) - f () + local plugin, route = false, false + local f = load(l) + f () - if instance["route_id"] ~= nil then route = true end - if instance["plugin_id"] ~= nil then plugin = true end + if instance["route_id"] ~= nil then route = true end + if instance["plugin_id"] ~= nil then plugin = true end - if route then - local old_order = ARDOUR.ProcessorList() - for k, v in pairs(instance["order"]) do - local proc = Session:processor_by_id(PBD.ID(v)) - if proc:isnil() then goto nextline end - old_order:push_back(proc) + if route then + local old_order = ARDOUR.ProcessorList() + for k, v in pairs(instance["order"]) do + local proc = Session:processor_by_id(PBD.ID(v)) + if proc:isnil() then goto nextline end + old_order:push_back(proc) + end + local rid = PBD.ID(instance["route_id"]) + local rt = Session:route_by_id(rid) + if rt:isnil() then goto nextline end + local gc, tc, pc = instance["gain_control"], instance["trim_control"], instance["pan_control"] + rt:gain_control():set_value(gc, 1) + rt:trim_control():set_value(tc, 1) + if pc ~= false then rt:pan_azimuth_control():set_value(pc, 1) end + rt:reorder_processors(old_order, nil) end - local rid = PBD.ID(instance["route_id"]) - local rt = Session:route_by_id(rid) - if rt:isnil() then goto nextline end - local gc, tc, pc, act = instance["gain_control"], instance["trim_control"], instance["pan_control"], instance["active"] - rt:gain_control():set_value(gc, 1) - rt:trim_control():set_value(tc, 1) - if pc ~= false then rt:pan_azimuth_control():set_value(pc, 1) end - rt:reorder_processors(old_order, nil) - end - if plugin then - local id = PBD.ID(instance["plugin_id"]) - local proc = Session:processor_by_id(id) - if proc:isnil() then goto nextline end - for k, v in pairs(instance["parameters"]) do - ARDOUR.LuaAPI.set_processor_param(proc, k, v) + if plugin then + local act = instance["active"] + local id = PBD.ID(instance["plugin_id"]) + local proc = Session:processor_by_id(id) + if proc:isnil() then goto nextline end + for k, v in pairs(instance["parameters"]) do + ARDOUR.LuaAPI.set_processor_param(proc, k, v) + end + if act then proc:activate() else proc:deactivate() end end - end - ::nextline:: - instance = nil + ::nextline:: end end local dialog_options = { { type = "label", colspan= 10, title = "" }, - {type = "radio", colspan= 10, key = "select", title = "", values ={ ["1. Mark"] = "mark", ["2. Recall"] = "recall" }, default = "1. Mark"}, + { type = "radio", colspan= 10, key = "select", title = "", values ={ ["1. Mark"] = "mark", ["2. Recall"] = "recall" }, default = "1. Mark"}, { type = "label", colspan= 10, title = "" }, } local rv = LuaDialog.Dialog("Mixer Store:", dialog_options):run() - assert(rv, 'Dialog box was cancelled or is ' .. type(rv)) + assert(rv, 'Dialog box was canceled or is ' .. type(rv)) local c = rv["select"] if c == "mark" then mark() end if c == "recall" then recall() end