I said, LESS ugly, not more :)

diff --git a/scripts/_store_recall_mixer.lua b/scripts/_store_recall_mixer.lua
index b9c457ad3a282c90f53854a7fca238b5f72e86a7..0d20cfb1e1bd7e910d2cb99028ebdc71e48f19a2 100644 (file)
--- a/scripts/_store_recall_mixer.lua
+++ b/scripts/_store_recall_mixer.lua
@@ -7,90 +7,96 @@ ardour {
 
 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:close()
-               for r in Session:get_routes():iter() do
-                       if r:is_monitor () or r:is_auditioner () then goto nextroute end -- skip special routes
-         local order = ARDOUR.ProcessorList()
-         local x = 0
+    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:close()
+        for r in Session:get_routes():iter() do
+            if r:is_monitor () or r:is_auditioner () then goto nextroute end -- skip special routes
+
+            local order = ARDOUR.ProcessorList()
+            local x = 0
             repeat
-               local proc = r:nth_processor(x)
-               if not proc:isnil () then
-                  order:push_back(proc)
-               end
-               x = x + 1
+                local proc = r:nth_processor(x)
+                if not proc:isnil () then
+                    order:push_back(proc)
+                end
+                x = x + 1
             until proc:isnil ()
-         local i = 0
-                       while true do
+
+        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 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
-                                               local label = plug:parameter_label (j)
-                                               if plug:parameter_is_input (j) and label ~= "hidden" and label:sub (1,1) ~= "#" then
-                                                       local _, _, pd = ARDOUR.LuaAPI.plugin_automation(proc, n)
-                                                       local val = ARDOUR.LuaAPI.get_processor_param(proc, j, true)
-                     if not(val == pd.normal) then
-                        params[n] = val
-                     end
-                                               end
-                                               n = n + 1
-                                       end
-                               end
-                               i = i + 1
+            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
+                        local label = plug:parameter_label (j)
+                        if plug:parameter_is_input (j) and label ~= "hidden" and label:sub (1,1) ~= "#" then
+                            local _, _, pd = ARDOUR.LuaAPI.plugin_automation(proc, n)
+                            local val = ARDOUR.LuaAPI.get_processor_param(proc, j, true)
+                            if not(val == pd.normal) then
+                                params[n] = val
+                            end
+                        end
+                        n = n + 1
+                    end
+                end
+                i = i + 1
             for k, v in pairs(params) do
-               params_str = params_str .. "[".. k .."] = " .. v .. ","
+                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
-         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
+        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::
-               end
-       end
-
-       function recall()
-      local file = io.open(path, "r")
-      assert(file, "File not found!")
-               for l in file:lines() do
-
-         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 route then
+        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::
+
+        end
+    end
+
+    function recall()
+        local file = io.open(path, "r")
+        assert(file, "File not found!")
+        for l in file:lines() do
+
+        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 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)
+                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)
@@ -102,26 +108,26 @@ function factory() return function()
             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)
-             end
-         end
-         ::nextline::
-         instance = nil
-               end
-       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)
+            end
+        end
+        ::nextline::
+        instance = nil
+        end
+    end
 
-   local dialog_options = {
+    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 = "label", colspan= 10, title = "" },
     }
 
-        local rv = LuaDialog.Dialog("Mixer Store:", dialog_options):run()
+    local rv = LuaDialog.Dialog("Mixer Store:", dialog_options):run()
     assert(rv, 'Dialog box was cancelled or is ' .. type(rv))
     local c = rv["select"]
     if c == "mark" then mark() end