X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fluainstance.cc;h=d8a1ce6382d1bf72c310f42aeb7d88bcd706e703;hb=af2ee3c8564c7d60cadb130b8c7ad1f4cddd2216;hp=48a10b2e84846992da0bb8ab1961e87e385250d7;hpb=f49d0a1b1d1435316ab64d87b2684b830b438e64;p=ardour.git diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index 48a10b2e84..d8a1ce6382 100644 --- a/gtk2_ardour/luainstance.cc +++ b/gtk2_ardour/luainstance.cc @@ -30,17 +30,24 @@ #include "LuaBridge/LuaBridge.h" +#include "ardour_http.h" #include "ardour_ui.h" #include "public_editor.h" #include "region_selection.h" +#include "luadialog.h" #include "luainstance.h" #include "luasignal.h" #include "marker.h" +#include "region_view.h" +#include "processor_box.h" #include "time_axis_view.h" +#include "time_axis_view_item.h" #include "selection.h" #include "script_selector.h" +#include "timers.h" +#include "utils_videotl.h" -#include "i18n.h" +#include "pbd/i18n.h" namespace LuaCairo { /** wrap RefPtr< Cairo::ImageSurface > @@ -176,16 +183,6 @@ class PangoLayout { _layout->set_text (text); } - /** Returns the number of Unicode characters in the - * the text of @a layout. - * - * @return The number of Unicode characters - * in the text of @a layout. - */ - int get_character_count () const { - return _layout->get_character_count (); - } - /** Sets the layout text and attribute list from marked-up text (see markup format). * Replaces the current text and attribute list. * @param markup Some marked-up text. @@ -314,6 +311,11 @@ class PangoLayout { pango_cairo_show_layout (c->cobj (), _layout->gobj()); } + void layout_cairo_path (Cairo::Context* c) { + pango_cairo_update_layout (c->cobj (), _layout->gobj()); + pango_cairo_layout_path (c->cobj (), _layout->gobj()); + } + private: Glib::RefPtr _layout; }; @@ -355,6 +357,17 @@ const char *luasignalstr[] = { #undef ENGINE }; // namespace + +/** special cases for Ardour's Mixer UI */ +namespace LuaMixer { + + ProcessorBox::ProcSelection + processor_selection () { + return ProcessorBox::current_processor_selection (); + } + +}; + //////////////////////////////////////////////////////////////////////////////// #define xstr(s) stringify(s) @@ -362,6 +375,8 @@ const char *luasignalstr[] = { using namespace ARDOUR; +PBD::Signal0 LuaInstance::LuaTimerDS; + void LuaInstance::register_hooks (lua_State* L) { @@ -475,7 +490,7 @@ LuaInstance::bind_cairo (lua_State* L) .addFunction ("get_stride", &LuaCairo::ImageSurface::get_stride) .addFunction ("get_width", &LuaCairo::ImageSurface::get_width) .addFunction ("get_height", &LuaCairo::ImageSurface::get_height) - .addFunction ("get_data", &LuaCairo::ImageSurface::get_data) + //.addFunction ("get_data", &LuaCairo::ImageSurface::get_data) // uint8_t* array is n/a .endClass () .beginClass ("PangoLayout") @@ -484,7 +499,7 @@ LuaInstance::bind_cairo (lua_State* L) .addFunction ("get_text", &LuaCairo::PangoLayout::get_text) .addFunction ("set_text", &LuaCairo::PangoLayout::set_text) .addFunction ("show_in_cairo_context", &LuaCairo::PangoLayout::show_in_cairo_context) - .addFunction ("get_character_count", &LuaCairo::PangoLayout::get_character_count) + .addFunction ("layout_cairo_path", &LuaCairo::PangoLayout::layout_cairo_path) .addFunction ("set_markup", &LuaCairo::PangoLayout::set_markup) .addFunction ("set_width", &LuaCairo::PangoLayout::set_width) .addFunction ("set_ellipsize", &LuaCairo::PangoLayout::set_ellipsize) @@ -534,6 +549,51 @@ LuaInstance::bind_cairo (lua_State* L) } +void +LuaInstance::bind_dialog (lua_State* L) +{ + luabridge::getGlobalNamespace (L) + .beginNamespace ("LuaDialog") + + .beginClass ("Message") + .addConstructor () + .addFunction ("run", &LuaDialog::Message::run) + .endClass () + + .beginClass ("Dialog") + .addConstructor () + .addCFunction ("run", &LuaDialog::Dialog::run) + .endClass () + + /* enums */ + .beginNamespace ("MessageType") + .addConst ("Info", LuaDialog::Message::Info) + .addConst ("Warning", LuaDialog::Message::Warning) + .addConst ("Question", LuaDialog::Message::Question) + .addConst ("Error", LuaDialog::Message::Error) + .endNamespace () + + .beginNamespace ("ButtonType") + .addConst ("OK", LuaDialog::Message::OK) + .addConst ("Close", LuaDialog::Message::Close) + .addConst ("Cancel", LuaDialog::Message::Cancel) + .addConst ("Yes_No", LuaDialog::Message::Yes_No) + .addConst ("OK_Cancel", LuaDialog::Message::OK_Cancel) + .endNamespace () + + .beginNamespace ("Response") + .addConst ("OK", 0) + .addConst ("Cancel", 1) + .addConst ("Close", 2) + .addConst ("Yes", 3) + .addConst ("No", 4) + .addConst ("None", -1) + .endNamespace () + + .endNamespace (); + +} + void LuaInstance::register_classes (lua_State* L) { @@ -543,11 +603,16 @@ LuaInstance::register_classes (lua_State* L) LuaBindings::osc (L); bind_cairo (L); + bind_dialog (L); register_hooks (L); luabridge::getGlobalNamespace (L) .beginNamespace ("ArdourUI") + .addFunction ("http_get", (std::string (*)(const std::string&))&ArdourCurl::http_get) + + .addFunction ("processor_selection", &LuaMixer::processor_selection) + .beginStdList ("ArdourMarkerList") .endClass () @@ -557,17 +622,38 @@ LuaInstance::register_classes (lua_State* L) .addFunction ("_type", &ArdourMarker::type) .endClass () -#if 0 .beginClass ("AxisView") .endClass () + .deriveClass ("TimeAxisView") .endClass () - .deriveClass ("RouteTimeAxisView") + + .beginClass ("Selectable") + .endClass () + + .deriveClass ("TimeAxisViewItem") + .endClass () + + .deriveClass ("RegionView") + .endClass () + + .deriveClass ("RouteUI") + .endClass () + + .deriveClass ("RouteTimeAxisView") + .addCast ("to_timeaxisview") + .endClass () + + // std::list + .beginStdCPtrList ("SelectionList") .endClass () -#endif + + // std::list + .beginStdCPtrList ("TrackViewStdList") + .endClass () + .beginClass ("RegionSelection") - .addFunction ("clear_all", &RegionSelection::clear_all) .addFunction ("start", &RegionSelection::start) .addFunction ("end_frame", &RegionSelection::end_frame) .addFunction ("n_midi_regions", &RegionSelection::n_midi_regions) @@ -583,8 +669,9 @@ LuaInstance::register_classes (lua_State* L) .deriveClass > ("MarkerSelection") .endClass () - .beginClass ("TrackViewList") - .addFunction ("routelist", &TrackViewList::routelist) // XXX check windows binding (libardour) + .deriveClass > ("TrackViewList") + .addFunction ("contains", &TrackViewList::contains) + .addFunction ("routelist", &TrackViewList::routelist) .endClass () .deriveClass ("TrackSelection") @@ -630,6 +717,8 @@ LuaInstance::register_classes (lua_State* L) .addFunction ("get_cut_buffer", &PublicEditor::get_cut_buffer) .addRefFunction ("get_selection_extents", &PublicEditor::get_selection_extents) + .addFunction ("set_selection", &PublicEditor::set_selection) + .addFunction ("play_selection", &PublicEditor::play_selection) .addFunction ("play_with_preroll", &PublicEditor::play_with_preroll) .addFunction ("maybe_locate_with_edit_preroll", &PublicEditor::maybe_locate_with_edit_preroll) @@ -660,21 +749,23 @@ LuaInstance::register_classes (lua_State* L) .addFunction ("get_current_zoom", &PublicEditor::get_current_zoom) .addFunction ("reset_zoom", &PublicEditor::reset_zoom) -#if 0 // These need TimeAxisView* which isn't exposed, yet - .addFunction ("playlist_selector", &PublicEditor::playlist_selector) .addFunction ("clear_playlist", &PublicEditor::clear_playlist) .addFunction ("new_playlists", &PublicEditor::new_playlists) .addFunction ("copy_playlists", &PublicEditor::copy_playlists) .addFunction ("clear_playlists", &PublicEditor::clear_playlists) -#endif .addFunction ("select_all_tracks", &PublicEditor::select_all_tracks) .addFunction ("deselect_all", &PublicEditor::deselect_all) -#if 0 + +#if 0 // TimeAxisView& can't be bound (pure virtual fn) .addFunction ("set_selected_track", &PublicEditor::set_selected_track) .addFunction ("set_selected_mixer_strip", &PublicEditor::set_selected_mixer_strip) - .addFunction ("hide_track_in_display", &PublicEditor::hide_track_in_display) + .addFunction ("ensure_time_axis_view_is_visible", &PublicEditor::ensure_time_axis_view_is_visible) #endif + .addFunction ("hide_track_in_display", &PublicEditor::hide_track_in_display) + .addFunction ("show_track_in_display", &PublicEditor::show_track_in_display) + + .addFunction ("regionview_from_region", &PublicEditor::regionview_from_region) .addFunction ("set_stationary_playhead", &PublicEditor::set_stationary_playhead) .addFunction ("stationary_playhead", &PublicEditor::stationary_playhead) .addFunction ("set_follow_playhead", &PublicEditor::set_follow_playhead) @@ -685,7 +776,6 @@ LuaInstance::register_classes (lua_State* L) .addFunction ("current_page_samples", &PublicEditor::current_page_samples) .addFunction ("visible_canvas_height", &PublicEditor::visible_canvas_height) .addFunction ("temporal_zoom_step", &PublicEditor::temporal_zoom_step) - //.addFunction ("ensure_time_axis_view_is_visible", &PublicEditor::ensure_time_axis_view_is_visible) .addFunction ("override_visible_track_count", &PublicEditor::override_visible_track_count) .addFunction ("scroll_tracks_down_line", &PublicEditor::scroll_tracks_down_line) @@ -717,15 +807,15 @@ LuaInstance::register_classes (lua_State* L) .addFunction ("set_video_timeline_height", &PublicEditor::set_video_timeline_height) #if 0 - .addFunction ("get_route_view_by_route_id", &PublicEditor::get_route_view_by_route_id) .addFunction ("get_equivalent_regions", &PublicEditor::get_equivalent_regions) - - .addFunction ("axis_view_from_route", &PublicEditor::axis_view_from_route) - .addFunction ("axis_views_from_routes", &PublicEditor::axis_views_from_routes) - .addFunction ("get_track_views", &PublicEditor::get_track_views) .addFunction ("drags", &PublicEditor::drags) #endif + .addFunction ("get_route_view_by_route_id", &PublicEditor::get_route_view_by_route_id) + .addFunction ("get_track_views", &PublicEditor::get_track_views) + .addFunction ("rtav_from_route", &PublicEditor::rtav_from_route) + .addFunction ("axis_views_from_routes", &PublicEditor::axis_views_from_routes) + .addFunction ("center_screen", &PublicEditor::center_screen) .addFunction ("get_smart_mode", &PublicEditor::get_smart_mode) @@ -767,6 +857,13 @@ LuaInstance::register_classes (lua_State* L) .addConst ("PunchOut", ArdourMarker::Type(ArdourMarker::PunchOut)) .endNamespace () + .beginNamespace ("SelectionOp") + .addConst ("Toggle", Selection::Operation(Selection::Toggle)) + .addConst ("Set", Selection::Operation(Selection::Set)) + .addConst ("Extend", Selection::Operation(Selection::Extend)) + .addConst ("Add", Selection::Operation(Selection::Add)) + .endNamespace () + .endNamespace (); // end ArdourUI // Editing Symbols @@ -804,11 +901,12 @@ using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace std; -#ifndef NDEBUG static void _lua_print (std::string s) { +#ifndef NDEBUG std::cout << "LuaInstance: " << s << "\n"; -} #endif + PBD::info << "LuaInstance: " << s << endmsg; +} LuaInstance* LuaInstance::_instance = 0; @@ -822,11 +920,16 @@ LuaInstance::instance () return _instance; } +void +LuaInstance::destroy_instance () +{ + delete _instance; + _instance = 0; +} + LuaInstance::LuaInstance () { -#ifndef NDEBUG lua.Print.connect (&_lua_print); -#endif init (); LuaScriptParamList args; @@ -835,6 +938,7 @@ LuaInstance::LuaInstance () LuaInstance::~LuaInstance () { delete _lua_call_action; + delete _lua_render_icon; delete _lua_add_action; delete _lua_del_action; delete _lua_get_action; @@ -850,22 +954,28 @@ LuaInstance::init () { lua.do_command ( "function ScriptManager ()" - " local self = { scripts = {}, instances = {} }" + " local self = { scripts = {}, instances = {}, icons = {} }" "" " local remove = function (id)" " self.scripts[id] = nil" " self.instances[id] = nil" + " self.icons[id] = nil" " end" "" - " local addinternal = function (i, n, s, f, a)" + " local addinternal = function (i, n, s, f, c, a)" " assert(type(i) == 'number', 'id must be numeric')" " assert(type(n) == 'string', 'Name must be string')" " assert(type(s) == 'string', 'Script must be string')" " assert(type(f) == 'function', 'Factory is a not a function')" " assert(type(a) == 'table' or type(a) == 'nil', 'Given argument is invalid')" - " self.scripts[i] = { ['n'] = n, ['s'] = s, ['f'] = f, ['a'] = a }" + " self.scripts[i] = { ['n'] = n, ['s'] = s, ['f'] = f, ['a'] = a, ['c'] = c }" " local env = _ENV; env.f = nil env.debug = nil os.exit = nil require = nil dofile = nil loadfile = nil package = nil" " self.instances[i] = load (string.dump(f, true), nil, nil, env)(a)" + " if type(c) == 'function' then" + " self.icons[i] = load (string.dump(c, true), nil, nil, env)(a)" + " else" + " self.icons[i] = nil" + " end" " end" "" " local call = function (id)" @@ -879,17 +989,26 @@ LuaInstance::init () " collectgarbage()" " end" "" - " local add = function (i, n, s, b, a)" + " local icon = function (id, ...)" + " if type(self.icons[id]) == 'function' then" + " pcall (self.icons[id], ...)" + " end" + " collectgarbage()" + " end" + "" + " local add = function (i, n, s, b, c, a)" " assert(type(b) == 'string', 'ByteCode must be string')" - " load (b)()" // assigns f + " f = nil load (b)()" // assigns f + " icn = nil load (c)()" // may assign "icn" " assert(type(f) == 'string', 'Assigned ByteCode must be string')" - " addinternal (i, n, s, load(f), a)" + " addinternal (i, n, s, load(f), type(icn) ~= \"string\" or icn == '' or load(icn), a)" " end" "" " local get = function (id)" " if type(self.scripts[id]) == 'table' then" " return { ['name'] = self.scripts[id]['n']," " ['script'] = self.scripts[id]['s']," + " ['icon'] = type(self.scripts[id]['c']) == 'function'," " ['args'] = self.scripts[id]['a'] }" " end" " return nil" @@ -905,7 +1024,6 @@ LuaInstance::init () "" " local function serialize (name, value)" " local rv = name .. ' = '" - " collectgarbage()" " if type(value) == \"number\" or type(value) == \"string\" or type(value) == \"nil\" then" " return rv .. basic_serialize(value) .. ' '" " elseif type(value) == \"table\" then" @@ -913,11 +1031,12 @@ LuaInstance::init () " for k,v in pairs(value) do" " local fieldname = string.format(\"%s[%s]\", name, basic_serialize(k))" " rv = rv .. serialize(fieldname, v) .. ' '" - " collectgarbage()" // string concatenation allocates a new string " end" " return rv;" " elseif type(value) == \"function\" then" " return rv .. string.format(\"%q\", string.dump(value, true))" + " elseif type(value) == \"boolean\" then" + " return rv .. tostring (value)" " else" " error('cannot save a ' .. type(value))" " end" @@ -931,6 +1050,7 @@ LuaInstance::init () " local clear = function ()" " self.scripts = {}" " self.instances = {}" + " self.icons = {}" " collectgarbage()" " end" "" @@ -938,13 +1058,13 @@ LuaInstance::init () " clear()" " load (state)()" " for i, s in pairs (scripts) do" - " addinternal (i, s['n'], s['s'], load(s['f']), s['a'])" + " addinternal (i, s['n'], s['s'], load(s['f']), type (s['c']) ~= \"string\" or s['c'] == '' or load (s['c']), s['a'])" " end" " collectgarbage()" " end" "" " return { call = call, add = add, remove = remove, get = get," - " restore = restore, save = save, clear = clear}" + " restore = restore, save = save, clear = clear, icon = icon}" " end" " " " manager = ScriptManager ()" @@ -962,6 +1082,7 @@ LuaInstance::init () _lua_del_action = new luabridge::LuaRef(lua_mgr["remove"]); _lua_get_action = new luabridge::LuaRef(lua_mgr["get"]); _lua_call_action = new luabridge::LuaRef(lua_mgr["call"]); + _lua_render_icon = new luabridge::LuaRef(lua_mgr["icon"]); _lua_save = new luabridge::LuaRef(lua_mgr["save"]); _lua_load = new luabridge::LuaRef(lua_mgr["restore"]); _lua_clear = new luabridge::LuaRef(lua_mgr["clear"]); @@ -992,12 +1113,15 @@ void LuaInstance::set_session (Session* s) for (LuaCallbackMap::iterator i = _callbacks.begin(); i != _callbacks.end(); ++i) { i->second->set_session (s); } + point_one_second_connection = Timers::rapid_connect (sigc::mem_fun(*this, & LuaInstance::every_point_one_seconds)); } void LuaInstance::session_going_away () { ENSURE_GUI_THREAD (*this, &LuaInstance::session_going_away); + point_one_second_connection.disconnect (); + (*_lua_clear)(); for (int i = 0; i < 9; ++i) { ActionChanged (i, ""); /* EMIT SIGNAL */ @@ -1010,6 +1134,12 @@ LuaInstance::session_going_away () lua.do_command ("collectgarbage();"); } +void +LuaInstance::every_point_one_seconds () +{ + LuaTimerDS (); // emit signal +} + int LuaInstance::set_state (const XMLNode& node) { @@ -1056,16 +1186,25 @@ bool LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id) { std::string title; + std::string param_function = "action_params"; std::vector reg; switch (type) { case LuaScriptInfo::EditorAction: reg = lua_action_names (); - title = "Add Lua Action"; + title = _("Add Lua Action"); break; case LuaScriptInfo::EditorHook: reg = lua_slot_names (); - title = "Add Lua Callback Hook"; + title = _("Add Lua Callback Hook"); + break; + case LuaScriptInfo::Session: + if (!_session) { + return false; + } + reg = _session->registered_lua_functions (); + title = _("Add Lua Session Script"); + param_function = "sess_params"; break; default: return false; @@ -1093,16 +1232,22 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id) return false; } - LuaScriptParamList lsp = LuaScriptParams::script_params (spi, "action_params"); + LuaScriptParamList lsp = LuaScriptParams::script_params (spi, param_function); ScriptParameterDialog spd (_("Set Script Parameters"), spi, reg, lsp); - switch (spd.run ()) { - case Gtk::RESPONSE_ACCEPT: - break; - default: - return false; + + if (!spd.need_interation ()) { + switch (spd.run ()) { + case Gtk::RESPONSE_ACCEPT: + break; + default: + return false; + } } + LuaScriptParamPtr lspp (new LuaScriptParam("x-script-origin", "", spi->path, false)); + lsp.push_back (lspp); + switch (type) { case LuaScriptInfo::EditorAction: return set_lua_action (id, spd.name(), script, lsp); @@ -1110,6 +1255,18 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id) case LuaScriptInfo::EditorHook: return register_lua_slot (spd.name(), script, lsp); break; + case LuaScriptInfo::Session: + try { + _session->register_lua_function (spd.name(), script, lsp); + } catch (luabridge::LuaException const& e) { + string msg = string_compose (_("Session script '%1' instantiation failed: %2"), spd.name(), e.what ()); + Gtk::MessageDialog am (msg); + am.run (); + } catch (SessionException e) { + string msg = string_compose (_("Loading Session script '%1' failed: %2"), spd.name(), e.what ()); + Gtk::MessageDialog am (msg); + am.run (); + } default: break; } @@ -1132,7 +1289,7 @@ LuaInstance::get_action_state () g_free (b64); XMLNode* script_node = new XMLNode (X_("ActionScript")); - script_node->add_property (X_("lua"), LUA_VERSION); + script_node->set_property (X_("lua"), LUA_VERSION); script_node->add_content (b64s); return *script_node; @@ -1153,11 +1310,29 @@ LuaInstance::call_action (const int id) { try { (*_lua_call_action)(id + 1); + lua.collect_garbage_step (); } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; } } +void +LuaInstance::render_action_icon (cairo_t* cr, int w, int h, uint32_t c, void* i) { + int ii = reinterpret_cast (i); + instance()->render_icon (ii, cr, w, h, c); +} + +void +LuaInstance::render_icon (int i, cairo_t* cr, int w, int h, uint32_t clr) +{ + Cairo::Context ctx (cr); + try { + (*_lua_render_icon)(i + 1, (Cairo::Context *)&ctx, w, h, clr); + } catch (luabridge::LuaException const& e) { + cerr << "LuaException:" << e.what () << endl; + } +} + bool LuaInstance::set_lua_action ( const int id, @@ -1170,17 +1345,19 @@ LuaInstance::set_lua_action ( // get bytcode of factory-function in a sandbox // (don't allow scripts to interfere) const std::string& bytecode = LuaScripting::get_factory_bytecode (script); + const std::string& iconfunc = LuaScripting::get_factory_bytecode (script, "icon", "icn"); luabridge::LuaRef tbl_arg (luabridge::newTable(L)); for (LuaScriptParamList::const_iterator i = args.begin(); i != args.end(); ++i) { if ((*i)->optional && !(*i)->is_set) { continue; } tbl_arg[(*i)->name] = (*i)->value; } - (*_lua_add_action)(id + 1, name, script, bytecode, tbl_arg); + (*_lua_add_action)(id + 1, name, script, bytecode, iconfunc, tbl_arg); ActionChanged (id, name); /* EMIT SIGNAL */ } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; return false; } + _session->set_dirty (); return true; } @@ -1194,6 +1371,7 @@ LuaInstance::remove_lua_action (const int id) return false; } ActionChanged (id, ""); /* EMIT SIGNAL */ + _session->set_dirty (); return true; } @@ -1230,6 +1408,23 @@ LuaInstance::lua_action_names () return rv; } +bool +LuaInstance::lua_action_has_icon (const int id) +{ + try { + luabridge::LuaRef ref ((*_lua_get_action)(id + 1)); + if (ref.isNil()) { + return false; + } + if (ref["icon"].isBoolean()) { + return ref["icon"].cast(); + } + } catch (luabridge::LuaException const& e) { + cerr << "LuaException:" << e.what () << endl; + } + return false; +} + bool LuaInstance::lua_action (const int id, std::string& name, std::string& script, LuaScriptParamList& args) { @@ -1273,9 +1468,7 @@ LuaInstance::register_lua_slot (const std::string& name, const std::string& scri ActionHook ah; try { LuaState l; -#ifndef NDEBUG l.Print.connect (&_lua_print); -#endif lua_State* L = l.getState(); register_hooks (L); l.do_command ("function ardour () end"); @@ -1304,6 +1497,7 @@ LuaInstance::register_lua_slot (const std::string& name, const std::string& scri } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; } + _session->set_dirty (); return false; } @@ -1316,6 +1510,7 @@ LuaInstance::unregister_lua_slot (const PBD::ID& id) _callbacks.erase (i); return true; } + _session->set_dirty (); return false; } @@ -1453,17 +1648,25 @@ LuaCallback::get_state (void) luabridge::LuaRef savedstate ((*_lua_save)()); saved = savedstate.cast(); } - lua.collect_garbage (); + + lua.collect_garbage (); // this may be expensive: + /* Editor::instant_save() calls Editor::get_state() which + * calls LuaInstance::get_hook_state() which in turn calls + * this LuaCallback::get_state() for every registered hook. + * + * serialize in _lua_save() allocates many small strings + * on the lua-stack, collecting them all may take a ms. + */ gchar* b64 = g_base64_encode ((const guchar*)saved.c_str (), saved.size ()); std::string b64s (b64); g_free (b64); XMLNode* script_node = new XMLNode (X_("LuaCallback")); - script_node->add_property (X_("lua"), LUA_VERSION); - script_node->add_property (X_("id"), _id.to_s ()); - script_node->add_property (X_("name"), _name); - script_node->add_property (X_("signals"), _signals.to_string ()); + script_node->set_property (X_("lua"), LUA_VERSION); + script_node->set_property (X_("id"), _id.to_s ()); + script_node->set_property (X_("name"), _name); + script_node->set_property (X_("signals"), _signals.to_string ()); script_node->add_content (b64s); return *script_node; } @@ -1471,9 +1674,7 @@ LuaCallback::get_state (void) void LuaCallback::init (void) { -#ifndef NDEBUG lua.Print.connect (&_lua_print); -#endif lua.do_command ( "function ScriptManager ()" @@ -1531,7 +1732,6 @@ LuaCallback::init (void) "" " local function serialize (name, value)" " local rv = name .. ' = '" - " collectgarbage()" " if type(value) == \"number\" or type(value) == \"string\" or type(value) == \"nil\" then" " return rv .. basic_serialize(value) .. ' '" " elseif type(value) == \"table\" then" @@ -1539,11 +1739,12 @@ LuaCallback::init (void) " for k,v in pairs(value) do" " local fieldname = string.format(\"%s[%s]\", name, basic_serialize(k))" " rv = rv .. serialize(fieldname, v) .. ' '" - " collectgarbage()" // string concatenation allocates a new string " end" " return rv;" " elseif type(value) == \"function\" then" " return rv .. string.format(\"%q\", string.dump(value, true))" + " elseif type(value) == \"boolean\" then" + " return rv .. tostring (value)" " else" " error('cannot save a ' .. type(value))" " end" @@ -1639,11 +1840,13 @@ LuaCallback::set_session (ARDOUR::Session *s) { SessionHandlePtr::set_session (s); - if (_session) { - lua_State* L = lua.getState(); - LuaBindings::set_session (L, _session); + if (!_session) { + return; } + lua_State* L = lua.getState(); + LuaBindings::set_session (L, _session); + reconnect(); }