X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fluaproc.cc;h=4e2b32c83840a87876d2415bbe43859220e1e2d0;hb=9336bddee2b40e3e70699eec897ca100074db87a;hp=c5bc8222565f664e6e2338c4580aa0bc1cf37038;hpb=4537f5fb20b2f43394ef1b47aecfd320fce0c2bb;p=ardour.git diff --git a/libs/ardour/luaproc.cc b/libs/ardour/luaproc.cc index c5bc822256..4e2b32c838 100644 --- a/libs/ardour/luaproc.cc +++ b/libs/ardour/luaproc.cc @@ -22,7 +22,6 @@ #include #include "pbd/gstdio_compat.h" - #include "pbd/pthread_utils.h" #include "ardour/audio_buffer.h" @@ -37,7 +36,7 @@ #include "LuaBridge/LuaBridge.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; @@ -46,8 +45,14 @@ LuaProc::LuaProc (AudioEngine& engine, Session& session, const std::string &script) : Plugin (engine, session) - , _mempool ("LuaProc", 2097152) + , _mempool ("LuaProc", 3145728) +#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) @@ -55,6 +60,7 @@ LuaProc::LuaProc (AudioEngine& engine, , _designated_bypass_port (UINT32_MAX) , _control_data (0) , _shadow_data (0) + , _configured (false) , _has_midi_input (false) , _has_midi_output (false) { @@ -70,15 +76,23 @@ LuaProc::LuaProc (AudioEngine& engine, LuaProc::LuaProc (const LuaProc &other) : Plugin (other) - , _mempool ("LuaProc", 2097152) + , _mempool ("LuaProc", 3145728) +#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 ()) + , _origin (other._origin) , _lua_does_channelmapping (false) , _lua_has_inline_display (false) , _designated_bypass_port (UINT32_MAX) , _control_data (0) , _shadow_data (0) + , _configured (false) , _has_midi_input (false) , _has_midi_output (false) { @@ -97,14 +111,16 @@ LuaProc::LuaProc (const LuaProc &other) LuaProc::~LuaProc () { #ifdef WITH_LUAPROC_STATS if (_info && _stats_cnt > 0) { - printf ("LuaProc: '%s' run() avg: %.3f max: %.3f [ms]\n", + printf ("LuaProc: '%s' run() avg: %.3f max: %.3f [ms] p: %.1f\n", _info->name.c_str (), 0.0001f * _stats_avg[0] / (float) _stats_cnt, - 0.0001f * _stats_max[0]); - printf ("LuaProc: '%s' gc() avg: %.3f max: %.3f [ms]\n", + 0.0001f * _stats_max[0], + _stats_max[0] * (float)_stats_cnt / _stats_avg[0]); + printf ("LuaProc: '%s' gc() avg: %.3f max: %.3f [ms] p: %.1f\n", _info->name.c_str (), 0.0001f * _stats_avg[1] / (float) _stats_cnt, - 0.0001f * _stats_max[1]); + 0.0001f * _stats_max[1], + _stats_max[1] * (float)_stats_cnt / _stats_avg[1]); } #endif lua.do_command ("collectgarbage();"); @@ -117,25 +133,30 @@ void LuaProc::init () { #ifdef WITH_LUAPROC_STATS - _stats_avg[0] = _stats_avg[1] = _stats_max[0] = _stats_max[1] = _stats_cnt = 0; + _stats_avg[0] = _stats_avg[1] = _stats_max[0] = _stats_max[1] = 0; + _stats_cnt = -25; #endif - lua.tweak_rt_gc (); lua.Print.connect (sigc::mem_fun (*this, &LuaProc::lua_print)); // register session object lua_State* L = lua.getState (); + lua_mlock (L, 1); LuaBindings::stddef (L); LuaBindings::common (L); LuaBindings::dsp (L); luabridge::getGlobalNamespace (L) .beginNamespace ("Ardour") - .beginClass ("LuaProc") + .deriveClass ("LuaProc") .addFunction ("queue_draw", &LuaProc::queue_draw) .addFunction ("shmem", &LuaProc::instance_shm) .addFunction ("table", &LuaProc::instance_ref) + .addFunction ("route", &LuaProc::route) + .addFunction ("unique_id", &LuaProc::unique_id) + .addFunction ("name", &LuaProc::name) .endClass () .endNamespace (); + lua_mlock (L, 0); // add session to global lua namespace luabridge::push (L, &_session); @@ -146,13 +167,22 @@ LuaProc::init () lua_setglobal (L, "self"); // sandbox - lua.do_command ("io = nil os = nil loadfile = nil require = nil dofile = nil package = nil debug = nil"); + lua.sandbox (true); #if 0 lua.do_command ("for n in pairs(_G) do print(n) end print ('----')"); // print global env #endif lua.do_command ("function ardour () end"); } +boost::weak_ptr +LuaProc::route () const +{ + if (!_owner) { + return boost::weak_ptr(); + } + return static_cast(_owner)->weakroute (); +} + void LuaProc::lua_print (std::string s) { std::cout <<"LuaProc: " << s << "\n"; @@ -210,29 +240,9 @@ LuaProc::load_script () luabridge::LuaRef lua_dsp_init = luabridge::getGlobal (L, "dsp_init"); if (lua_dsp_init.type () == LUA_TFUNCTION) { try { - lua_dsp_init (_session.nominal_frame_rate ()); - } catch (luabridge::LuaException const& e) { - ; - } - } - - // query midi i/o - luabridge::LuaRef lua_dsp_has_midi_in = luabridge::getGlobal (L, "dsp_has_midi_input"); - if (lua_dsp_has_midi_in.type () == LUA_TFUNCTION) { - try { - _has_midi_input = lua_dsp_has_midi_in (); + lua_dsp_init (_session.nominal_sample_rate ()); } catch (luabridge::LuaException const& e) { - ; - } - } - - luabridge::LuaRef lua_dsp_has_midi_out = luabridge::getGlobal (L, "dsp_has_midi_output"); - if (lua_dsp_has_midi_out.type () == LUA_TFUNCTION) { - try { - _has_midi_output = lua_dsp_has_midi_out (); - } catch (luabridge::LuaException const& e) { - ; - } + } catch (...) { } } _ctrl_params.clear (); @@ -334,28 +344,28 @@ 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 (...) { + _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. @@ -363,130 +373,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 = _has_midi_output ? 1 : 0; + 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 || midi_out > 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_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 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_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 ANYTHINGGOES \ +#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 (possible_in == 0) { - if (_has_midi_output && audio_in == 0) { - // special case midi filters & generators - audio_out = 0; - found = true; - break; - } - } + 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 { @@ -495,94 +483,39 @@ 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) { - *imprecise = in; - imprecise->set (DataType::MIDI, _has_midi_input ? 1 : 0); - } - - 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"]; - - if (possible_out == 0 && possible_in == 0 && _has_midi_output) { - assert (audio_in > 0); // no input is handled above - // TODO hide audio input from plugin - imprecise->set (DataType::AUDIO, 0); - audio_out = 0; - found = true; - continue; - } - - 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) { @@ -590,20 +523,13 @@ LuaProc::can_support_io_configuration (const ChanCount& in, ChanCount& out, Chan } if (imprecise) { - imprecise->set (DataType::MIDI, _has_midi_input ? 1 : 0); _selected_in = *imprecise; } else { _selected_in = in; } - if (exact_match) { - out.set (DataType::MIDI, midi_out); - out.set (DataType::AUDIO, preferred_out); - printf("EXACT MATCH.. %d %d\n", preferred_out, audio_out); - } else { - out.set (DataType::MIDI, midi_out); - out.set (DataType::AUDIO, audio_out); - } + out.set (DataType::MIDI, midi_out); + out.set (DataType::AUDIO, audio_out); _selected_out = out; return true; @@ -619,7 +545,7 @@ LuaProc::configure_io (ChanCount in, ChanCount out) _info->n_outputs = _selected_out; // configure the DSP if needed - if (in != _configured_in || out != _configured_out) { + if (in != _configured_in || out != _configured_out || !_configured) { lua_State* L = lua.getState (); luabridge::LuaRef lua_dsp_configure = luabridge::getGlobal (L, "dsp_configure"); if (lua_dsp_configure.type () == LUA_TFUNCTION) { @@ -647,7 +573,6 @@ LuaProc::configure_io (ChanCount in, ChanCount out) lin.set (DataType::MIDI, c); } } - _info->n_inputs = lin; if (io["midi_out"].type() == LUA_TNUMBER) { const int c = io["midi_out"].cast (); if (c >= 0) { @@ -657,12 +582,15 @@ LuaProc::configure_io (ChanCount in, ChanCount out) _info->n_inputs = lin; _info->n_outputs = lout; } + _configured = true; } catch (luabridge::LuaException const& e) { PBD::error << "LuaException: " << e.what () << "\n"; #ifndef NDEBUG std::cerr << "LuaException: " << e.what () << "\n"; #endif return false; + } catch (...) { + return false; } } } @@ -675,9 +603,9 @@ LuaProc::configure_io (ChanCount in, ChanCount out) int LuaProc::connect_and_run (BufferSet& bufs, - framepos_t start, framepos_t end, double speed, + samplepos_t start, samplepos_t end, double speed, ChanMapping in, ChanMapping out, - pframes_t nframes, framecnt_t offset) + pframes_t nframes, samplecnt_t offset) { if (!_lua_dsp) { return 0; @@ -749,7 +677,7 @@ LuaProc::connect_and_run (BufferSet& bufs, if (valid) { for (MidiBuffer::iterator m = bufs.get_midi(idx).begin(); m != bufs.get_midi(idx).end(); ++m, ++e) { - const Evoral::MIDIEvent ev(*m, false); + const Evoral::Event ev(*m, false); luabridge::LuaRef lua_midi_data (luabridge::newTable (L)); const uint8_t* data = ev.buffer(); for (uint32_t i = 0; i < ev.size(); ++i) { @@ -758,6 +686,8 @@ 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_event["bytes"] = data; + lua_midi_event["size"] = ev.size(); lua_midi_src_tbl[e] = lua_midi_event; } } @@ -790,7 +720,7 @@ LuaProc::connect_and_run (BufferSet& bufs, 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"]; + samplepos_t tme = i.value ()["time"]; if (tme < 1 || tme > nframes) { continue; } uint8_t data[64]; size_t size = 0; @@ -811,6 +741,8 @@ LuaProc::connect_and_run (BufferSet& bufs, std::cerr << "LuaException: " << e.what () << "\n"; #endif return -1; + } catch (...) { + return -1; } #ifdef WITH_LUAPROC_STATS int64_t t1 = g_get_monotonic_time (); @@ -818,14 +750,15 @@ LuaProc::connect_and_run (BufferSet& bufs, lua.collect_garbage_step (); #ifdef WITH_LUAPROC_STATS - ++_stats_cnt; - int64_t t2 = g_get_monotonic_time (); - int64_t ela0 = t1 - t0; - int64_t ela1 = t2 - t1; - if (ela0 > _stats_max[0]) _stats_max[0] = ela0; - if (ela1 > _stats_max[1]) _stats_max[1] = ela1; - _stats_avg[0] += ela0; - _stats_avg[1] += ela1; + if (++_stats_cnt > 0) { + int64_t t2 = g_get_monotonic_time (); + int64_t ela0 = t1 - t0; + int64_t ela1 = t2 - t1; + if (ela0 > _stats_max[0]) _stats_max[0] = ela0; + if (ela1 > _stats_max[1]) _stats_max[1] = ela1; + _stats_avg[0] += ela0; + _stats_avg[1] += ela1; + } #endif return 0; } @@ -835,24 +768,21 @@ void LuaProc::add_state (XMLNode* root) const { XMLNode* child; - char buf[32]; - LocaleGuard lg; gchar* b64 = g_base64_encode ((const guchar*)_script.c_str (), _script.size ()); std::string b64s (b64); g_free (b64); XMLNode* script_node = new XMLNode (X_("script")); - script_node->add_property (X_("lua"), LUA_VERSION); + script_node->set_property (X_("lua"), LUA_VERSION); + script_node->set_property (X_("origin"), _origin); script_node->add_content (b64s); root->add_child_nocopy (*script_node); for (uint32_t i = 0; i < parameter_count(); ++i) { if (parameter_is_input(i) && parameter_is_control(i)) { child = new XMLNode("Port"); - snprintf(buf, sizeof(buf), "%u", i); - child->add_property("id", std::string(buf)); - snprintf(buf, sizeof(buf), "%+f", _shadow_data[i]); - child->add_property("value", std::string(buf)); + child->set_property("id", i); + child->set_property("value", _shadow_data[i]); root->add_child_nocopy(*child); } } @@ -867,6 +797,10 @@ LuaProc::set_script_from_state (const XMLNode& node) } if ((child = node.child (X_("script"))) != 0) { + XMLProperty const* prop; + if ((prop = node.property ("origin")) != 0) { + _origin = prop->value(); + } for (XMLNodeList::const_iterator n = child->children ().begin (); n != child->children ().end (); ++n) { if (!(*n)->is_content ()) { continue; } gsize size; @@ -899,14 +833,9 @@ LuaProc::set_state (const XMLNode& node, int version) { #ifndef NO_PLUGIN_STATE XMLNodeList nodes; - XMLProperty const * prop; XMLNodeConstIterator iter; XMLNode *child; - const char *value; - const char *port; - uint32_t port_id; #endif - LocaleGuard lg; if (_script.empty ()) { if (set_script_from_state (node)) { @@ -923,20 +852,21 @@ LuaProc::set_state (const XMLNode& node, int version) nodes = node.children ("Port"); for (iter = nodes.begin(); iter != nodes.end(); ++iter) { child = *iter; - if ((prop = child->property("id")) != 0) { - port = prop->value().c_str(); - } else { + + uint32_t port_id; + float value; + + if (!child->get_property("id", port_id)) { warning << _("LuaProc: port has no symbol, ignored") << endmsg; continue; } - if ((prop = child->property("value")) != 0) { - value = prop->value().c_str(); - } else { + + if (!child->get_property("value", value)) { warning << _("LuaProc: port has no value, ignored") << endmsg; continue; } - sscanf (port, "%" PRIu32, &port_id); - set_parameter (port_id, atof(value)); + + set_parameter (port_id, value); } #endif @@ -1109,6 +1039,7 @@ LuaProc::setup_lua_inline_gui (LuaState *lua_gui) LuaBindings::stddef (LG); LuaBindings::common (LG); LuaBindings::dsp (LG); + LuaBindings::osc (LG); lua_gui->Print.connect (sigc::mem_fun (*this, &LuaProc::lua_print)); lua_gui->do_command ("function ardour () end"); @@ -1127,7 +1058,7 @@ LuaProc::setup_lua_inline_gui (LuaState *lua_gui) luabridge::push (LG, this); lua_setglobal (LG, "self"); - luabridge::push (LG, _shadow_data); + luabridge::push (LG, _control_data); lua_setglobal (LG, "CtrlPorts"); } //////////////////////////////////////////////////////////////////////////////// @@ -1191,22 +1122,27 @@ LuaProc::load_preset (PresetRecord r) XMLNode* root = t->root (); for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) { - XMLProperty const * label = (*i)->property (X_("label")); - assert (label); - if (label->value() != r.label) { + std::string str; + if (!(*i)->get_property (X_("label"), str)) { + assert (false); + } + if (str != r.label) { continue; } for (XMLNodeList::const_iterator j = (*i)->children().begin(); j != (*i)->children().end(); ++j) { if ((*j)->name() == X_("Parameter")) { - XMLProperty const * index = (*j)->property (X_("index")); - XMLProperty const * value = (*j)->property (X_("value")); - assert (index); - assert (value); - set_parameter (atoi (index->value().c_str()), atof (value->value().c_str ())); + uint32_t index; + float value; + if (!(*j)->get_property (X_("index"), index) || + !(*j)->get_property (X_("value"), value)) { + assert (false); + } + set_parameter (index, value); + PresetPortSetValue (index, value); /* EMIT SIGNAL */ } } - return true; + return Plugin::load_preset(r); } return false; } @@ -1219,17 +1155,20 @@ LuaProc::do_save_preset (std::string name) { return ""; } + // prevent dups -- just in case + t->root()->remove_nodes_and_delete (X_("label"), name); + std::string uri (preset_name_to_uri (name)); XMLNode* p = new XMLNode (X_("Preset")); - p->add_property (X_("uri"), uri); - p->add_property (X_("label"), name); + p->set_property (X_("uri"), uri); + p->set_property (X_("label"), name); for (uint32_t i = 0; i < parameter_count(); ++i) { if (parameter_is_input (i)) { XMLNode* c = new XMLNode (X_("Parameter")); - c->add_property (X_("index"), string_compose ("%1", i)); - c->add_property (X_("value"), string_compose ("%1", get_parameter (i))); + c->set_property (X_("index"), i); + c->set_property (X_("value"), get_parameter (i)); p->add_child_nocopy (*c); } } @@ -1262,14 +1201,14 @@ LuaProc::find_presets () if (t) { XMLNode* root = t->root (); for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) { + std::string uri; + std::string label; - XMLProperty const * uri = (*i)->property (X_("uri")); - XMLProperty const * label = (*i)->property (X_("label")); - - assert (uri); - assert (label); + if (!(*i)->get_property (X_("uri"), uri) || !(*i)->get_property (X_("label"), label)) { + assert (false); + } - PresetRecord r (uri->value(), label->value(), true); + PresetRecord r (uri, label, true); _presets.insert (make_pair (r.uri, r)); } } @@ -1292,7 +1231,6 @@ LuaPluginInfo::LuaPluginInfo (LuaScriptInfoPtr lsi) { n_outputs.set (DataType::AUDIO, 1); type = Lua; - _is_instrument = category == "Instrument"; } PluginPtr @@ -1314,7 +1252,9 @@ LuaPluginInfo::load (Session& session) } try { - PluginPtr plugin (new LuaProc (session.engine (), session, script)); + LuaProc* lp = new LuaProc (session.engine (), session, script); + lp->set_origin (path); + PluginPtr plugin (lp); return plugin; } catch (failed_constructor& err) { ;