fix crash when copy'ing latent plugins
[ardour.git] / libs / ardour / luaproc.cc
index 30b34f584b84fed6f3ee696037fe83b05ade8ffd..fbba74bba328103788c8987ae02a4a1f6b76ca51 100644 (file)
@@ -22,7 +22,7 @@
 #include <glibmm/fileutils.h>
 
 #include "pbd/gstdio_compat.h"
-
+#include "pbd/locale_guard.h"
 #include "pbd/pthread_utils.h"
 
 #include "ardour/audio_buffer.h"
@@ -37,7 +37,7 @@
 
 #include "LuaBridge/LuaBridge.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -46,12 +46,19 @@ LuaProc::LuaProc (AudioEngine& engine,
                   Session& session,
                   const std::string &script)
        : Plugin (engine, session)
-       , _mempool ("LuaProc", 1048576) // 1 MB is plenty. (64K would be enough)
+       , _mempool ("LuaProc", 2097152)
+#ifdef USE_TLSF
+       , lua (lua_newstate (&PBD::TLSF::lalloc, &_mempool))
+#elif defined USE_MALLOC
+       , lua ()
+#else
        , lua (lua_newstate (&PBD::ReallocPool::lalloc, &_mempool))
+#endif
        , _lua_dsp (0)
        , _script (script)
        , _lua_does_channelmapping (false)
        , _lua_has_inline_display (false)
+       , _designated_bypass_port (UINT32_MAX)
        , _control_data (0)
        , _shadow_data (0)
        , _has_midi_input (false)
@@ -69,12 +76,19 @@ LuaProc::LuaProc (AudioEngine& engine,
 
 LuaProc::LuaProc (const LuaProc &other)
        : Plugin (other)
-       , _mempool ("LuaProc", 1048576) // 1 MB is plenty. (64K would be enough)
+       , _mempool ("LuaProc", 2097152)
+#ifdef USE_TLSF
+       , lua (lua_newstate (&PBD::TLSF::lalloc, &_mempool))
+#elif defined USE_MALLOC
+       , lua ()
+#else
        , lua (lua_newstate (&PBD::ReallocPool::lalloc, &_mempool))
+#endif
        , _lua_dsp (0)
        , _script (other.script ())
        , _lua_does_channelmapping (false)
        , _lua_has_inline_display (false)
+       , _designated_bypass_port (UINT32_MAX)
        , _control_data (0)
        , _shadow_data (0)
        , _has_midi_input (false)
@@ -118,6 +132,7 @@ LuaProc::init ()
        _stats_avg[0] = _stats_avg[1] = _stats_max[0] = _stats_max[1] = _stats_cnt = 0;
 #endif
 
+       lua.tweak_rt_gc ();
        lua.Print.connect (sigc::mem_fun (*this, &LuaProc::lua_print));
        // register session object
        lua_State* L = lua.getState ();
@@ -130,6 +145,7 @@ LuaProc::init ()
                .beginClass <LuaProc> ("LuaProc")
                .addFunction ("queue_draw", &LuaProc::queue_draw)
                .addFunction ("shmem", &LuaProc::instance_shm)
+               .addFunction ("table", &LuaProc::instance_ref)
                .endClass ()
                .endNamespace ();
 
@@ -212,16 +228,6 @@ LuaProc::load_script ()
                }
        }
 
-       luabridge::LuaRef lua_dsp_midi_in = luabridge::getGlobal (L, "dsp_midi_input");
-       if (lua_dsp_midi_in.type () == LUA_TFUNCTION) {
-               try {
-                       _has_midi_input = lua_dsp_midi_in ();
-               } catch (luabridge::LuaException const& e) {
-                       ;
-               }
-       }
-       lpi->_is_instrument = _has_midi_input;
-
        _ctrl_params.clear ();
 
        luabridge::LuaRef lua_render = luabridge::getGlobal (L, "render_inline");
@@ -275,6 +281,10 @@ LuaProc::load_script ()
                                _param_desc[pn].sr_dependent = lr["ratemult"].isBoolean () && (lr["ratemult"]).cast<bool> ();
                                _param_desc[pn].enumeration  = lr["enum"].isBoolean () && (lr["enum"]).cast<bool> ();
 
+                               if (lr["bypass"].isBoolean () && (lr["bypass"]).cast<bool> ()) {
+                                       _designated_bypass_port = pn - 1; // lua table starts at 1.
+                               }
+
                                if (lr["unit"].isString ()) {
                                        std::string unit = lr["unit"].cast<std::string> ();
                                        if (unit == "dB")             { _param_desc[pn].unit = ParameterDescriptor::DB; }
@@ -317,28 +327,26 @@ LuaProc::can_support_io_configuration (const ChanCount& in, ChanCount& out, Chan
        // caller must hold process lock (no concurrent calls to interpreter
        _output_configs.clear ();
 
-       if (in.n_midi() > 0 && !_has_midi_input && !imprecise) {
-               return false;
-       }
-
        lua_State* L = lua.getState ();
        luabridge::LuaRef ioconfig = luabridge::getGlobal (L, "dsp_ioconfig");
-       if (!ioconfig.isFunction ()) {
-               return false;
-       }
 
        luabridge::LuaRef *_iotable = NULL; // can't use reference :(
-       try {
-               luabridge::LuaRef iotable = ioconfig ();
-               if (iotable.isTable ()) {
-                       _iotable = new luabridge::LuaRef (iotable);
+
+       if (ioconfig.isFunction ()) {
+               try {
+                       luabridge::LuaRef iotable = ioconfig ();
+                       if (iotable.isTable ()) {
+                               _iotable = new luabridge::LuaRef (iotable);
+                       }
+               } catch (luabridge::LuaException const& e) {
+                       _iotable = NULL;
                }
-       } catch (luabridge::LuaException const& e) {
-               return false;
        }
 
        if (!_iotable) {
-               return false;
+               /* empty table as default */
+               luabridge::LuaRef iotable = luabridge::newTable(L);
+               _iotable = new luabridge::LuaRef (iotable);
        }
 
        // now we can reference it.
@@ -346,121 +354,108 @@ LuaProc::can_support_io_configuration (const ChanCount& in, ChanCount& out, Chan
        delete _iotable;
 
        if ((iotable).length () < 1) {
-               return false;
+               /* empty table as only config, to get default values */
+               luabridge::LuaRef ioconf = luabridge::newTable(L);
+               iotable[1] = ioconf;
        }
 
-       bool found = false;
-       bool exact_match = false;
-       const int32_t audio_in = in.n_audio ();
-       int32_t midi_out = 0; // TODO handle  _has_midi_output
+       const int audio_in = in.n_audio ();
+       const int midi_in = in.n_midi ();
 
        // preferred setting (provided by plugin_insert)
-       assert (out.n_audio () > 0);
        const int preferred_out = out.n_audio ();
+       const int preferred_midiout = out.n_midi ();
 
-       for (luabridge::Iterator i (iotable); !i.isNil (); ++i) {
-               assert (i.value ().type () == LUA_TTABLE);
-               luabridge::LuaRef io (i.value ());
-
-               int possible_in = io["audio_in"];
-               int possible_out = io["audio_out"];
-
-               // exact match
-               if ((possible_in == audio_in) && (possible_out == preferred_out)) {
-                       _output_configs.insert (preferred_out);
-                       exact_match = true;
-                       found = true;
-                       break;
-               }
-       }
-
-       /* now allow potentially "imprecise" matches */
-       int32_t audio_out = -1;
+       int midi_out = -1;
+       int audio_out = -1;
        float penalty = 9999;
+       bool found = false;
 
-#define FOUNDCFG(nch) {                            \
-  float p = fabsf ((float)(nch) - preferred_out);  \
-  _output_configs.insert (nch);                    \
-  if ((nch) > preferred_out) { p *= 1.1; }         \
-  if (p < penalty) {                               \
-    audio_out = (nch);                             \
-    penalty = p;                                   \
-    found = true;                                  \
-  }                                                \
+#define FOUNDCFG_PENALTY(in, out, p) {                              \
+  _output_configs.insert (out);                                     \
+  if (p < penalty) {                                                \
+    audio_out = (out);                                              \
+    midi_out = possible_midiout;                                    \
+    if (imprecise) {                                                \
+      imprecise->set (DataType::AUDIO, (in));                       \
+      imprecise->set (DataType::MIDI, possible_midiin);             \
+    }                                                               \
+    _has_midi_input = (possible_midiin > 0);                        \
+    _has_midi_output = (possible_midiout > 0);                      \
+    penalty = p;                                                    \
+    found = true;                                                   \
+  }                                                                 \
 }
 
-#define ANYTHINGGOES                               \
+#define FOUNDCFG_IMPRECISE(in, out) {                               \
+  const float p = fabsf ((float)(out) - preferred_out) *            \
+                      (((out) > preferred_out) ? 1.1 : 1)           \
+                + fabsf ((float)possible_midiout - preferred_midiout) *    \
+                      ((possible_midiout - preferred_midiout) ? 0.6 : 0.5) \
+                + fabsf ((float)(in) - audio_in) *                  \
+                      (((in) > audio_in) ? 275 : 250)               \
+                + fabsf ((float)possible_midiin - midi_in) *        \
+                      ((possible_midiin - midi_in) ? 100 : 110);    \
+  FOUNDCFG_PENALTY(in, out, p);                                     \
+}
+
+#define FOUNDCFG(out)                                               \
+  FOUNDCFG_IMPRECISE(audio_in, out)
+
+#define ANYTHINGGOES                                                \
   _output_configs.insert (0);
 
-#define UPTO(nch) {                                \
-  for (int n = 1; n < nch; ++n) {                  \
-    _output_configs.insert (n);                    \
-  }                                                \
+#define UPTO(nch) {                                                 \
+  for (int n = 1; n < nch; ++n) {                                   \
+    _output_configs.insert (n);                                     \
+  }                                                                 \
 }
 
+       if (imprecise) {
+               *imprecise = in;
+       }
+
        for (luabridge::Iterator i (iotable); !i.isNil (); ++i) {
-               assert (i.value ().type () == LUA_TTABLE);
                luabridge::LuaRef io (i.value ());
+               if (!io.isTable()) {
+                       continue;
+               }
 
-               int possible_in = io["audio_in"];
-               int possible_out = io["audio_out"];
+               int possible_in = io["audio_in"].isNumber() ? io["audio_in"] : -1;
+               int possible_out = io["audio_out"].isNumber() ? io["audio_out"] : -1;
+               int possible_midiin = io["midi_in"].isNumber() ? io["midi_in"] : 0;
+               int possible_midiout = io["midi_out"].isNumber() ? io["midi_out"] : 0;
 
-               if (possible_out == 0) {
+               if (midi_in != possible_midiin && !imprecise) {
                        continue;
                }
-               if (possible_in == 0) {
-                       /* no inputs, generators & instruments */
-                       if (possible_out == -1) {
-                               /* any configuration possible, stereo output */
-                               FOUNDCFG (preferred_out);
-                               ANYTHINGGOES;
-                       } else if (possible_out == -2) {
-                               /* invalid, should be (0, -1) */
-                               FOUNDCFG (preferred_out);
-                               ANYTHINGGOES;
-                       } else if (possible_out < -2) {
-                               /* variable number of outputs up to -N, */
-                               FOUNDCFG (min (-possible_out, preferred_out));
-                               UPTO (-possible_out);
-                       } else {
-                               /* exact number of outputs */
-                               FOUNDCFG (possible_out);
-                       }
+
+               // exact match
+               if ((possible_in == audio_in) && (possible_out == preferred_out)) {
+                       /* Set penalty so low that this output configuration
+                        * will trump any other one */
+                       FOUNDCFG_PENALTY(audio_in, preferred_out, -1);
                }
 
-               if (possible_in == -1) {
-                       /* wildcard for input */
-                       if (possible_out == -1) {
-                               /* out must match in */
-                               FOUNDCFG (audio_in);
-                       } else if (possible_out == -2) {
-                               /* any configuration possible, pick matching */
-                               FOUNDCFG (preferred_out);
-                               ANYTHINGGOES;
-                       } else if (possible_out < -2) {
-                               /* explicitly variable number of outputs, pick maximum */
-                               FOUNDCFG (max (-possible_out, preferred_out));
-                               /* and try min, too, in case the penalty is lower */
-                               FOUNDCFG (min (-possible_out, preferred_out));
-                               UPTO (-possible_out)
-                       } else {
-                               /* exact number of outputs */
-                               FOUNDCFG (possible_out);
-                       }
+               if (possible_out == 0 && possible_midiout == 0) {
+                       /* skip configurations with no output at all */
+                       continue;
                }
 
-               if (possible_in == -2) {
-                       if (possible_out == -1) {
-                               /* any configuration possible, pick matching */
-                               FOUNDCFG (preferred_out);
-                               ANYTHINGGOES;
-                       } else if (possible_out == -2) {
-                               /* invalid. interpret as (-1, -1) */
+               if (possible_in == -1 || possible_in == -2) {
+                       /* wildcard for input */
+                       if (possible_out == possible_in) {
+                               /* either both -1 or both -2 (invalid and
+                                * interpreted as both -1): out must match in */
+                               FOUNDCFG (audio_in);
+                       } else if (possible_out == -3 - possible_in) {
+                               /* one is -1, the other is -2: any output configuration
+                                * possible, pick what the insert prefers */
                                FOUNDCFG (preferred_out);
                                ANYTHINGGOES;
                        } else if (possible_out < -2) {
-                               /* invalid,  interpret as (<-2, <-2)
-                                * variable number of outputs up to -N, */
+                               /* variable number of outputs up to -N,
+                                * invalid if in == -2 but we accept it anyway */
                                FOUNDCFG (min (-possible_out, preferred_out));
                                UPTO (-possible_out)
                        } else {
@@ -469,123 +464,124 @@ LuaProc::can_support_io_configuration (const ChanCount& in, ChanCount& out, Chan
                        }
                }
 
-               if (possible_in < -2) {
-                       /* explicit variable number of inputs */
-                       if (audio_in > -possible_in && imprecise != NULL) {
-                               // hide inputs ports
-                               imprecise->set (DataType::AUDIO, -possible_in);
-                       }
-
-                       if (audio_in > -possible_in && imprecise == NULL) {
-                               /* request is too large */
-                       } else if (possible_out == -1) {
-                               /* any output configuration possible */
-                               FOUNDCFG (preferred_out);
-                               ANYTHINGGOES;
-                       } else if (possible_out == -2) {
-                               /* invalid. interpret as (<-2, -1) */
-                               FOUNDCFG (preferred_out);
-                               ANYTHINGGOES;
-                       } else if (possible_out < -2) {
-                               /* variable number of outputs up to -N, */
-                               FOUNDCFG (min (-possible_out, preferred_out));
-                               UPTO (-possible_out)
+               if (possible_in < -2 || possible_in >= 0) {
+                       /* specified number, exact or up to */
+                       int desired_in;
+                       if (possible_in >= 0) {
+                               /* configuration can only match possible_in */
+                               desired_in = possible_in;
                        } else {
-                               /* exact number of outputs */
-                               FOUNDCFG (possible_out);
+                               /* configuration can match up to -possible_in */
+                               desired_in = min (-possible_in, audio_in);
                        }
-               }
-
-               if (possible_in && (possible_in == audio_in)) {
-                       /* exact number of inputs ... must match obviously */
-                       if (possible_out == -1) {
-                               /* any output configuration possible */
-                               FOUNDCFG (preferred_out);
-                               ANYTHINGGOES;
-                       } else if (possible_out == -2) {
-                               /* invalid. interpret as (>0, -1) */
-                               FOUNDCFG (preferred_out);
+                       if (!imprecise && audio_in != desired_in) {
+                               /* skip that configuration, it cannot match
+                                * the required audio input count, and we
+                                * cannot ask for change via \imprecise */
+                       } else if (possible_out == -1 || possible_out == -2) {
+                               /* any output configuration possible
+                                * out == -2 is invalid, interpreted as out == -1.
+                                * Really imprecise only if desired_in != audio_in */
+                               FOUNDCFG_IMPRECISE (desired_in, preferred_out);
                                ANYTHINGGOES;
                        } else if (possible_out < -2) {
-                               /* > 0, < -2 is not specified
-                                * interpret as up to -N */
-                               FOUNDCFG (min (-possible_out, preferred_out));
+                               /* variable number of outputs up to -N
+                                * not specified if in > 0, but we accept it anyway.
+                                * Really imprecise only if desired_in != audio_in */
+                               FOUNDCFG_IMPRECISE (desired_in, min (-possible_out, preferred_out));
                                UPTO (-possible_out)
                        } else {
-                               /* exact number of outputs */
-                               FOUNDCFG (possible_out);
+                               /* exact number of outputs
+                                * Really imprecise only if desired_in != audio_in */
+                               FOUNDCFG_IMPRECISE (desired_in, possible_out);
                        }
                }
-       }
-
-       if (!found && imprecise) {
-               /* try harder */
-               for (luabridge::Iterator i (iotable); !i.isNil (); ++i) {
-                       assert (i.value ().type () == LUA_TTABLE);
-                       luabridge::LuaRef io (i.value ());
-
-                       int possible_in = io["audio_in"];
-                       int possible_out = io["audio_out"];
 
-                       assert (possible_in > 0); // all other cases will have been matched above
-                       assert (possible_out !=0 || possible_in !=0); // already handled above
-
-                       imprecise->set (DataType::AUDIO, possible_in);
-                       if (possible_out == -1 || possible_out == -2) {
-                               FOUNDCFG (2);
-                       } else if (possible_out < -2) {
-                               /* explicitly variable number of outputs, pick maximum */
-                               FOUNDCFG (min (-possible_out, preferred_out));
-                       } else {
-                               /* exact number of outputs */
-                               FOUNDCFG (possible_out);
-                       }
-                       // ideally we'll also find the closest, best matching
-                       // input configuration with minimal output penalty...
-               }
        }
 
        if (!found) {
                return false;
        }
 
-       if (exact_match) {
-               out.set (DataType::MIDI, midi_out); // currently always zero
-               out.set (DataType::AUDIO, preferred_out);
+       if (imprecise) {
+               _selected_in = *imprecise;
        } else {
-               out.set (DataType::MIDI, midi_out); // currently always zero
-               out.set (DataType::AUDIO, audio_out);
+               _selected_in = in;
        }
+
+       out.set (DataType::MIDI, midi_out);
+       out.set (DataType::AUDIO, audio_out);
+       _selected_out = out;
+
        return true;
 }
 
 bool
 LuaProc::configure_io (ChanCount in, ChanCount out)
 {
-       _configured_in = in;
-       _configured_out = out;
+       in.set (DataType::MIDI, _has_midi_input ? 1 : 0);
+       out.set (DataType::MIDI, _has_midi_output ? 1 : 0);
 
-       _configured_in.set (DataType::MIDI, _has_midi_input ? 1 : 0);
-       _configured_out.set (DataType::MIDI, _has_midi_output ? 1 : 0);
+       _info->n_inputs = _selected_in;
+       _info->n_outputs = _selected_out;
 
        // configure the DSP if needed
-       lua_State* L = lua.getState ();
-       luabridge::LuaRef lua_dsp_configure = luabridge::getGlobal (L, "dsp_configure");
-       if (lua_dsp_configure.type () == LUA_TFUNCTION) {
-               try {
-                       lua_dsp_configure (&in, &out);
-               } catch (luabridge::LuaException const& e) {
-                       return false;
+       if (in != _configured_in || out != _configured_out) {
+               lua_State* L = lua.getState ();
+               luabridge::LuaRef lua_dsp_configure = luabridge::getGlobal (L, "dsp_configure");
+               if (lua_dsp_configure.type () == LUA_TFUNCTION) {
+                       try {
+                               luabridge::LuaRef io = lua_dsp_configure (&in, &out);
+                               if (io.isTable ()) {
+                                       ChanCount lin (_selected_in);
+                                       ChanCount lout (_selected_out);
+
+                                       if (io["audio_in"].type() == LUA_TNUMBER) {
+                                               const int c = io["audio_in"].cast<int> ();
+                                               if (c >= 0) {
+                                                       lin.set (DataType::AUDIO, c);
+                                               }
+                                       }
+                                       if (io["audio_out"].type() == LUA_TNUMBER) {
+                                               const int c = io["audio_out"].cast<int> ();
+                                               if (c >= 0) {
+                                                       lout.set (DataType::AUDIO, c);
+                                               }
+                                       }
+                                       if (io["midi_in"].type() == LUA_TNUMBER) {
+                                               const int c = io["midi_in"].cast<int> ();
+                                               if (c >= 0) {
+                                                       lin.set (DataType::MIDI, c);
+                                               }
+                                       }
+                                       if (io["midi_out"].type() == LUA_TNUMBER) {
+                                               const int c = io["midi_out"].cast<int> ();
+                                               if (c >= 0) {
+                                                       lout.set (DataType::MIDI, c);
+                                               }
+                                       }
+                                       _info->n_inputs = lin;
+                                       _info->n_outputs = lout;
+                               }
+                       } catch (luabridge::LuaException const& e) {
+                               PBD::error << "LuaException: " << e.what () << "\n";
+#ifndef NDEBUG
+                               std::cerr << "LuaException: " << e.what () << "\n";
+#endif
+                               return false;
+                       }
                }
        }
 
-       _info->n_inputs = _configured_in;
-       _info->n_outputs = _configured_out;
+       _configured_in = in;
+       _configured_out = out;
+
        return true;
 }
 
 int
 LuaProc::connect_and_run (BufferSet& bufs,
+               framepos_t start, framepos_t end, double speed,
                ChanMapping in, ChanMapping out,
                pframes_t nframes, framecnt_t offset)
 {
@@ -593,7 +589,7 @@ LuaProc::connect_and_run (BufferSet& bufs,
                return 0;
        }
 
-       Plugin::connect_and_run (bufs, in, out, nframes, offset);
+       Plugin::connect_and_run (bufs, start, end, speed, in, out, nframes, offset);
 
        // This is needed for ARDOUR::Session requests :(
        if (! SessionEvent::has_per_thread_pool ()) {
@@ -651,7 +647,7 @@ LuaProc::connect_and_run (BufferSet& bufs,
                                }
                        }
 
-                       luabridge::LuaRef lua_midi_tbl (luabridge::newTable (L));
+                       luabridge::LuaRef lua_midi_src_tbl (luabridge::newTable (L));
                        int e = 1; // > 1 port, we merge events (unsorted)
                        for (uint32_t mp = 0; mp < midi_in; ++mp) {
                                bool valid;
@@ -668,20 +664,52 @@ LuaProc::connect_and_run (BufferSet& bufs,
                                                luabridge::LuaRef lua_midi_event (luabridge::newTable (L));
                                                lua_midi_event["time"] = 1 + (*m).time();
                                                lua_midi_event["data"] = lua_midi_data;
-                                               lua_midi_tbl[e] = lua_midi_event;
+                                               lua_midi_src_tbl[e] = lua_midi_event;
                                        }
                                }
                        }
 
                        if (_has_midi_input) {
                                // XXX TODO This needs a better solution than global namespace
-                               luabridge::push (L, lua_midi_tbl);
-                               lua_setglobal (L, "mididata");
+                               luabridge::push (L, lua_midi_src_tbl);
+                               lua_setglobal (L, "midiin");
                        }
 
+                       luabridge::LuaRef lua_midi_sink_tbl (luabridge::newTable (L));
+                       if (_has_midi_output) {
+                               luabridge::push (L, lua_midi_sink_tbl);
+                               lua_setglobal (L, "midiout");
+                       }
 
                        // run the DSP function
                        (*_lua_dsp)(in_map, out_map, nframes);
+
+                       // copy back midi events
+                       if (_has_midi_output && lua_midi_sink_tbl.isTable ()) {
+                               bool valid;
+                               const uint32_t idx = out.get(DataType::MIDI, 0, &valid);
+                               if (valid && bufs.count().n_midi() > idx) {
+                                       MidiBuffer& mbuf = bufs.get_midi(idx);
+                                       mbuf.silence(0, 0);
+                                       for (luabridge::Iterator i (lua_midi_sink_tbl); !i.isNil (); ++i) {
+                                               if (!i.key ().isNumber ()) { continue; }
+                                               if (!i.value ()["time"].isNumber ()) { continue; }
+                                               if (!i.value ()["data"].isTable ()) { continue; }
+                                               luabridge::LuaRef data_tbl (i.value ()["data"]);
+                                               framepos_t tme = i.value ()["time"];
+                                               if (tme < 1 || tme > nframes) { continue; }
+                                               uint8_t data[64];
+                                               size_t size = 0;
+                                               for (luabridge::Iterator di (data_tbl); !di.isNil () && size < sizeof(data); ++di, ++size) {
+                                                       data[size] = di.value ();
+                                               }
+                                               if (size > 0 && size < 64) {
+                                                       mbuf.push_back(tme - 1, size, data);
+                                               }
+                                       }
+
+                               }
+                       }
                }
        } catch (luabridge::LuaException const& e) {
                PBD::error << "LuaException: " << e.what () << "\n";
@@ -693,7 +721,8 @@ LuaProc::connect_and_run (BufferSet& bufs,
 #ifdef WITH_LUAPROC_STATS
        int64_t t1 = g_get_monotonic_time ();
 #endif
-       lua.collect_garbage (); // rt-safe, slight *regular* performance overhead
+
+       lua.collect_garbage_step ();
 #ifdef WITH_LUAPROC_STATS
        ++_stats_cnt;
        int64_t t2 = g_get_monotonic_time ();
@@ -713,7 +742,7 @@ LuaProc::add_state (XMLNode* root) const
 {
        XMLNode*    child;
        char        buf[32];
-       LocaleGuard lg ();
+       LocaleGuard lg;
 
        gchar* b64 = g_base64_encode ((const guchar*)_script.c_str (), _script.size ());
        std::string b64s (b64);
@@ -783,7 +812,7 @@ LuaProc::set_state (const XMLNode& node, int version)
        const char *port;
        uint32_t port_id;
 #endif
-       LocaleGuard lg ();
+       LocaleGuard lg;
 
        if (_script.empty ()) {
                if (set_script_from_state (node)) {
@@ -997,6 +1026,7 @@ LuaProc::setup_lua_inline_gui (LuaState *lua_gui)
                .beginNamespace ("Ardour")
                .beginClass <LuaProc> ("LuaProc")
                .addFunction ("shmem", &LuaProc::instance_shm)
+               .addFunction ("table", &LuaProc::instance_ref)
                .endClass ()
                .endNamespace ();
 
@@ -1079,10 +1109,11 @@ LuaProc::load_preset (PresetRecord r)
                                XMLProperty const * value = (*j)->property (X_("value"));
                                assert (index);
                                assert (value);
+                               LocaleGuard lg;
                                set_parameter (atoi (index->value().c_str()), atof (value->value().c_str ()));
                        }
                }
-               return true;
+               return Plugin::load_preset(r);
        }
        return false;
 }
@@ -1167,6 +1198,8 @@ LuaPluginInfo::LuaPluginInfo (LuaScriptInfoPtr lsi) {
        n_inputs.set (DataType::AUDIO, 1);
        n_outputs.set (DataType::AUDIO, 1);
        type = Lua;
+
+       _is_instrument = category == "Instrument";
 }
 
 PluginPtr