use ordered list of routes and fix some dialog box names

diff --git a/scripts/mixer_settings_recall.lua b/scripts/mixer_settings_recall.lua
index 1fcfd7ae45190f36e5c057d9cb28614bc0054efb..365262d70387f439fb8da19a865bf3aa061ef7fa 100644 (file)
--- a/scripts/mixer_settings_recall.lua
+++ b/scripts/mixer_settings_recall.lua
@@ -379,7 +379,7 @@ function factory () return function ()
                                recall_options[2]['path'] = global_default_path
                                local rv = LuaDialog.Dialog("Recall Mixer Settings:", recall_options):run()
                                if not(rv) then return end
-                               local dry_return = LuaDialog.Dialog("Mixer Store:", dry_run(false, rv['file'])):run()
+                               local dry_return = LuaDialog.Dialog("Mixer Recall:", dry_run(false, rv['file'])):run()
                                if dry_return then
                                        recall(false, rv['file'], dry_return)
                                else
@@ -400,7 +400,7 @@ function factory () return function ()
                                recall_options[2]['path'] = local_default_path
                                local rv = LuaDialog.Dialog("Recall Mixer Settings:", recall_options):run()
                                if not(rv) then return end
-                               local dry_return = LuaDialog.Dialog("Mixer Store:", dry_run(false, rv['file'])):run()
+                               local dry_return = LuaDialog.Dialog("Mixer Recall:", dry_run(false, rv['file'])):run()
                                if dry_return then
                                        recall(true, rv['file'], dry_return)
                                else

diff --git a/scripts/mixer_settings_store.lua b/scripts/mixer_settings_store.lua
index 4c697aeb2a13c1af7469584b465ff214a8c0dea8..0708a0a547cb88c95ba1a9fdce903d878ce02eb8 100644 (file)
--- a/scripts/mixer_settings_store.lua
+++ b/scripts/mixer_settings_store.lua
@@ -174,7 +174,7 @@ function factory () return function ()
                local groups_to_write = {}
                local i = 0
 
-               local tracks = Session:get_routes()
+               local tracks = Session:get_stripables()
 
                if selected then tracks = sel.tracks:routelist() end
 
@@ -212,10 +212,9 @@ function factory () return function ()
                end
 
                for r in tracks:iter() do
-                       if r:is_monitor () or r:is_auditioner () then goto nextroute end -- skip special routes
-
-                       print(r:name(), r:presentation_info_ptr():order())
-
+                       if r:is_monitor () or r:is_auditioner () or not(r:to_vca():isnil()) then goto nextroute end -- skip special routes
+                       r = r:to_route()
+                       if r:isnil() then goto nextroute end
                        local order = ARDOUR.ProcessorList()
                        local x = 0
                        repeat