X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fluainstance.cc;h=8f9572b98e7da461365eaa4c17461bfe7fd41eea;hb=efc858dc8149f3b3456781451ef42dc69eee2d5e;hp=bfa72b2907696d0b3a352c9c10fe6c64e894f569;hpb=a732c7c9faa316a4a0af908fb3bf8abd28f41b0a;p=ardour.git diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index bfa72b2907..8f9572b98e 100644 --- a/gtk2_ardour/luainstance.cc +++ b/gtk2_ardour/luainstance.cc @@ -20,13 +20,18 @@ #include #include +#include "pbd/strsplit.h" + +#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/gui_thread.h" #include "ardour/audioengine.h" -#include "ardour/diskstream.h" +#include "ardour/disk_reader.h" +#include "ardour/disk_writer.h" #include "ardour/plugin_manager.h" #include "ardour/route.h" #include "ardour/session.h" +#include "ardour/system_exec.h" #include "LuaBridge/LuaBridge.h" @@ -34,11 +39,14 @@ #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" @@ -308,6 +316,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; }; @@ -362,12 +375,139 @@ namespace LuaMixer { //////////////////////////////////////////////////////////////////////////////// +static PBD::ScopedConnectionList _luaexecs; + +static void reaper (ARDOUR::SystemExec* x) +{ + delete x; +} + +static int +lua_forkexec (lua_State *L) +{ + int argc = lua_gettop (L); + if (argc == 0) { + return luaL_argerror (L, 1, "invalid number of arguments, forkexec (command, ...)"); + } + // args are free()ed in ~SystemExec + char** args = (char**) malloc ((argc + 1) * sizeof(char*)); + for (int i = 0; i < argc; ++i) { + args[i] = strdup (luaL_checkstring (L, i + 1)); + } + args[argc] = 0; + + ARDOUR::SystemExec* x = new ARDOUR::SystemExec (args[0], args); + x->Terminated.connect (_luaexecs, MISSING_INVALIDATOR, boost::bind (&reaper, x), gui_context()); + + if (x->start()) { + reaper (x); + luabridge::Stack::push (L, false); + return -1; + } else { + luabridge::Stack::push (L, false); + } + return 1; +} + +#ifndef PLATFORM_WINDOWS +static int +lua_exec (std::string cmd) +{ + // args are free()ed in ~SystemExec + char** args = (char**) malloc (4 * sizeof(char*)); + args[0] = strdup ("/bin/sh"); + args[1] = strdup ("-c"); + args[2] = strdup (cmd.c_str()); + args[3] = 0; + ARDOUR::SystemExec x ("/bin/sh", args); + if (x.start()) { + return -1; + } + x.wait (); + return 0; +} +#endif + +//////////////////////////////////////////////////////////////////////////////// + +static int +lua_actionlist (lua_State *L) +{ + using namespace std; + + vector paths; + vector labels; + vector tooltips; + vector keys; + vector > actions; + Gtkmm2ext::ActionMap::get_all_actions (paths, labels, tooltips, keys, actions); + + vector::iterator p; + vector::iterator l; + + luabridge::LuaRef action_tbl (luabridge::newTable (L)); + + for (l = labels.begin(), p = paths.begin(); l != labels.end(); ++p, ++l) { + if (l->empty ()) { + continue; + } + + vector parts; + split (*p, parts, '/'); + + if (parts.empty()) { + continue; + } + + //kinda kludgy way to avoid displaying menu items as mappable + if (parts[1] == _("Main_menu")) + continue; + if (parts[1] == _("JACK")) + continue; + if (parts[1] == _("redirectmenu")) + continue; + if (parts[1] == _("Editor_menus")) + continue; + if (parts[1] == _("RegionList")) + continue; + if (parts[1] == _("ProcessorMenu")) + continue; + + /* strip / from the start */ + string path = (*p); + path = path.substr (strlen ("/")); + + if (!action_tbl[parts[1]].isTable()) { + action_tbl[parts[1]] = luabridge::newTable (L); + } + assert (action_tbl[parts[1]].isTable()); + luabridge::LuaRef tbl (action_tbl[parts[1]]); + assert (tbl.isTable()); + tbl[*l] = path; + } + + luabridge::push (L, action_tbl); + return 1; +} + +//////////////////////////////////////////////////////////////////////////////// + +// ARDOUR_UI and instance() are not exposed. +ARDOUR::PresentationInfo::order_t +lua_translate_order (RouteDialogs::InsertAt place) +{ + return ARDOUR_UI::instance()->translate_order (place); +} + +//////////////////////////////////////////////////////////////////////////////// + #define xstr(s) stringify(s) #define stringify(s) #s using namespace ARDOUR; PBD::Signal0 LuaInstance::LuaTimerDS; +PBD::Signal0 LuaInstance::SetSession; void LuaInstance::register_hooks (lua_State* L) @@ -389,6 +529,10 @@ LuaInstance::register_hooks (lua_State* L) .beginStdBitSet ("Set") .endClass() .endNamespace (); + +#if 0 // Dump size -> libs/ardour/luabindings.cc + printf ("LuaInstance: registered %d signals\n", LuaSignal::LAST_SIGNAL); +#endif } void @@ -491,6 +635,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 ("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) @@ -540,6 +685,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) { @@ -549,7 +739,7 @@ LuaInstance::register_classes (lua_State* L) LuaBindings::osc (L); bind_cairo (L); - register_hooks (L); + bind_dialog (L); luabridge::getGlobalNamespace (L) .beginNamespace ("ArdourUI") @@ -567,34 +757,60 @@ LuaInstance::register_classes (lua_State* L) .addFunction ("_type", &ArdourMarker::type) .endClass () -#if 0 .beginClass ("AxisView") .endClass () + .deriveClass ("TimeAxisView") .endClass () - .deriveClass ("RouteTimeAxisView") + + .deriveClass ("StripableTimeAxisView") .endClass () -#endif + + .beginClass ("Selectable") + .endClass () + + .deriveClass ("TimeAxisViewItem") + .endClass () + + .deriveClass ("RegionView") + .endClass () + + .deriveClass ("RouteUI") + .endClass () + + .deriveClass ("RouteTimeAxisView") + .addCast ("to_stripabletimeaxisview") + .addCast ("to_timeaxisview") // deprecated + .endClass () + + // std::list + .beginStdCPtrList ("SelectionList") + .endClass () + + // std::list + .beginStdCPtrList ("TrackViewStdList") + .endClass () + .beginClass ("RegionSelection") - .addFunction ("clear_all", &RegionSelection::clear_all) .addFunction ("start", &RegionSelection::start) - .addFunction ("end_frame", &RegionSelection::end_frame) + .addFunction ("end_sample", &RegionSelection::end_sample) .addFunction ("n_midi_regions", &RegionSelection::n_midi_regions) .addFunction ("regionlist", &RegionSelection::regionlist) // XXX check windows binding (libardour) .endClass () .deriveClass > ("TimeSelection") .addFunction ("start", &TimeSelection::start) - .addFunction ("end_frame", &TimeSelection::end_frame) + .addFunction ("end_sample", &TimeSelection::end_sample) .addFunction ("length", &TimeSelection::length) .endClass () .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") @@ -640,6 +856,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) @@ -670,21 +888,25 @@ 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 ("set_visible_track_count", &PublicEditor::set_visible_track_count) + .addFunction ("fit_selection", &PublicEditor::fit_selection) + + .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) @@ -695,7 +917,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) @@ -727,15 +948,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_stripable_time_axis_by_id", &PublicEditor::get_stripable_time_axis_by_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) @@ -760,9 +981,19 @@ LuaInstance::register_classes (lua_State* L) #endif .addFunction ("access_action", &PublicEditor::access_action) + .addFunction ("set_toggleaction", &PublicEditor::set_toggleaction) .endClass () + .addFunction ("translate_order", &lua_translate_order) + /* ArdourUI enums */ + .beginNamespace ("InsertAt") + .addConst ("BeforeSelection", RouteDialogs::InsertAt(RouteDialogs::BeforeSelection)) + .addConst ("AfterSelection", RouteDialogs::InsertAt(RouteDialogs::AfterSelection)) + .addConst ("First", RouteDialogs::InsertAt(RouteDialogs::First)) + .addConst ("Last", RouteDialogs::InsertAt(RouteDialogs::Last)) + .endNamespace () + .beginNamespace ("MarkerType") .addConst ("Mark", ArdourMarker::Type(ArdourMarker::Mark)) .addConst ("Tempo", ArdourMarker::Type(ArdourMarker::Tempo)) @@ -777,7 +1008,23 @@ LuaInstance::register_classes (lua_State* L) .addConst ("PunchOut", ArdourMarker::Type(ArdourMarker::PunchOut)) .endNamespace () - .endNamespace (); // end ArdourUI + .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 () + + .addCFunction ("actionlist", &lua_actionlist) + + .endNamespace () // end ArdourUI + + .beginNamespace ("os") +#ifndef PLATFORM_WINDOWS + .addFunction ("execute", &lua_exec) +#endif + .addCFunction ("forkexec", &lua_forkexec) + .endNamespace (); // Editing Symbols @@ -865,6 +1112,7 @@ LuaInstance::~LuaInstance () void LuaInstance::init () { + lua.sandbox (false); lua.do_command ( "function ScriptManager ()" " local self = { scripts = {}, instances = {}, icons = {} }" @@ -882,7 +1130,7 @@ LuaInstance::init () " 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, ['c'] = c }" - " local env = _ENV; env.f = nil env.debug = nil os.exit = nil require = nil dofile = nil loadfile = nil package = nil" + " local env = _ENV; env.f = 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)" @@ -937,7 +1185,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" @@ -945,7 +1192,6 @@ 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" @@ -985,7 +1231,6 @@ LuaInstance::init () " manager = ScriptManager ()" " ScriptManager = nil" ); - lua_State* L = lua.getState(); try { @@ -1003,6 +1248,11 @@ LuaInstance::init () _lua_clear = new luabridge::LuaRef(lua_mgr["clear"]); } catch (luabridge::LuaException const& e) { + fatal << string_compose (_("programming error: %1"), + std::string ("Failed to setup Lua action interpreter") + e.what ()) + << endmsg; + abort(); /*NOTREACHED*/ + } catch (...) { fatal << string_compose (_("programming error: %1"), X_("Failed to setup Lua action interpreter")) << endmsg; @@ -1010,6 +1260,7 @@ LuaInstance::init () } register_classes (L); + register_hooks (L); luabridge::push (L, &PublicEditor::instance()); lua_setglobal (L, "Editor"); @@ -1029,6 +1280,7 @@ void LuaInstance::set_session (Session* s) i->second->set_session (s); } point_one_second_connection = Timers::rapid_connect (sigc::mem_fun(*this, & LuaInstance::every_point_one_seconds)); + SetSession (); /* EMIT SIGNAL */ } void @@ -1058,7 +1310,6 @@ LuaInstance::every_point_one_seconds () int LuaInstance::set_state (const XMLNode& node) { - LocaleGuard lg; XMLNode* child; if ((child = find_named_node (node, "ActionScript"))) { @@ -1070,7 +1321,7 @@ LuaInstance::set_state (const XMLNode& node) (*_lua_load)(std::string ((const char*)buf, size)); } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } for (int i = 0; i < 9; ++i) { std::string name; if (lua_action_name (i, name)) { @@ -1090,7 +1341,7 @@ LuaInstance::set_state (const XMLNode& node) SlotChanged (p->id(), p->name(), p->signals()); /* EMIT SIGNAL */ } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } } } @@ -1107,7 +1358,7 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id) switch (type) { case LuaScriptInfo::EditorAction: reg = lua_action_names (); - title = _("Add Lua Action"); + title = _("Add Shortcut or Lua Script"); break; case LuaScriptInfo::EditorHook: reg = lua_slot_names (); @@ -1140,23 +1391,38 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id) try { script = Glib::file_get_contents (spi->path); - } catch (Glib::FileError e) { + } catch (Glib::FileError const& e) { string msg = string_compose (_("Cannot read script '%1': %2"), spi->path, e.what()); Gtk::MessageDialog am (msg); am.run (); return false; } - LuaScriptParamList lsp = LuaScriptParams::script_params (spi, param_function); + LuaState ls; + register_classes (ls.getState ()); + LuaScriptParamList lsp = LuaScriptParams::script_params (ls, spi->path, param_function); - ScriptParameterDialog spd (_("Set Script Parameters"), spi, reg, lsp); - switch (spd.run ()) { - case Gtk::RESPONSE_ACCEPT: - break; - default: + /* allow cancel */ + for (size_t i = 0; i < lsp.size(); ++i) { + if (lsp[i]->preseeded && lsp[i]->name == "x-script-abort") { return false; + } } + ScriptParameterDialog spd (_("Set Script Parameters"), spi, reg, lsp); + + 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, true)); + lsp.push_back (lspp); + switch (type) { case LuaScriptInfo::EditorAction: return set_lua_action (id, spd.name(), script, lsp); @@ -1171,10 +1437,14 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id) string msg = string_compose (_("Session script '%1' instantiation failed: %2"), spd.name(), e.what ()); Gtk::MessageDialog am (msg); am.run (); - } catch (SessionException e) { + } catch (SessionException const& e) { string msg = string_compose (_("Loading Session script '%1' failed: %2"), spd.name(), e.what ()); Gtk::MessageDialog am (msg); am.run (); + } catch (...) { + string msg = string_compose (_("Loading Session script '%1' failed: %2"), spd.name(), "Unknown Exception"); + Gtk::MessageDialog am (msg); + am.run (); } default: break; @@ -1185,7 +1455,6 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id) XMLNode& LuaInstance::get_action_state () { - LocaleGuard lg; std::string saved; { luabridge::LuaRef savedstate ((*_lua_save)()); @@ -1198,7 +1467,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; @@ -1222,7 +1491,7 @@ LuaInstance::call_action (const int id) lua.collect_garbage_step (); } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } } void @@ -1239,7 +1508,7 @@ LuaInstance::render_icon (int i, cairo_t* cr, int w, int h, uint32_t clr) (*_lua_render_icon)(i + 1, (Cairo::Context *)&ctx, w, h, clr); } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } } bool @@ -1265,6 +1534,8 @@ LuaInstance::set_lua_action ( } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; return false; + } catch (...) { + return false; } _session->set_dirty (); return true; @@ -1278,6 +1549,8 @@ LuaInstance::remove_lua_action (const int id) } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; return false; + } catch (...) { + return false; } ActionChanged (id, ""); /* EMIT SIGNAL */ _session->set_dirty (); @@ -1299,8 +1572,7 @@ LuaInstance::lua_action_name (const int id, std::string& rv) return true; } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - return false; - } + } catch (...) { } return false; } @@ -1330,7 +1602,7 @@ LuaInstance::lua_action_has_icon (const int id) } } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } return false; } @@ -1365,8 +1637,7 @@ LuaInstance::lua_action (const int id, std::string& name, std::string& script, L return true; } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - return false; - } + } catch (...) { } return false; } @@ -1378,6 +1649,7 @@ LuaInstance::register_lua_slot (const std::string& name, const std::string& scri try { LuaState l; l.Print.connect (&_lua_print); + l.sandbox (true); lua_State* L = l.getState(); register_hooks (L); l.do_command ("function ardour () end"); @@ -1388,7 +1660,7 @@ LuaInstance::register_lua_slot (const std::string& name, const std::string& scri } } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } if (ah.none ()) { cerr << "Script registered no hooks." << endl; @@ -1405,7 +1677,7 @@ LuaInstance::register_lua_slot (const std::string& name, const std::string& scri return true; } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } _session->set_dirty (); return false; } @@ -1491,11 +1763,13 @@ LuaCallback::LuaCallback (Session *s, } try { - const std::string& bytecode = LuaScripting::get_factory_bytecode (script); - (*_lua_add)(name, script, bytecode, tbl_arg); + const std::string& bytecode = LuaScripting::get_factory_bytecode (script); + (*_lua_add)(name, script, bytecode, tbl_arg); } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; throw failed_constructor (); + } catch (...) { + throw failed_constructor (); } _id.reset (); @@ -1534,7 +1808,7 @@ LuaCallback::LuaCallback (Session *s, XMLNode & node) (*_lua_load)(std::string ((const char*)buf, size)); } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } g_free (buf); set_session (s); @@ -1557,17 +1831,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; } @@ -1576,6 +1858,7 @@ void LuaCallback::init (void) { lua.Print.connect (&_lua_print); + lua.sandbox (false); lua.do_command ( "function ScriptManager ()" @@ -1587,7 +1870,7 @@ LuaCallback::init (void) " assert(type(f) == 'function', 'Factory is a not a function')" " assert(type(a) == 'table' or type(a) == 'nil', 'Given argument is invalid')" " self.script = { ['n'] = n, ['s'] = s, ['f'] = f, ['a'] = a }" - " local env = _ENV; env.f = nil env.debug = nil os.exit = nil require = nil dofile = nil loadfile = nil package = nil" + " local env = _ENV; env.f = nil" " self.instance = load (string.dump(f, true), nil, nil, env)(a)" " end" "" @@ -1633,7 +1916,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" @@ -1641,7 +1923,6 @@ 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" @@ -1687,6 +1968,11 @@ LuaCallback::init (void) _lua_load = new luabridge::LuaRef(lua_mgr["restore"]); } catch (luabridge::LuaException const& e) { + fatal << string_compose (_("programming error: %1"), + std::string ("Failed to setup Lua callback interpreter: ") + e.what ()) + << endmsg; + abort(); /*NOTREACHED*/ + } catch (...) { fatal << string_compose (_("programming error: %1"), X_("Failed to setup Lua callback interpreter")) << endmsg; @@ -1694,6 +1980,7 @@ LuaCallback::init (void) } LuaInstance::register_classes (L); + LuaInstance::register_hooks (L); luabridge::push (L, &PublicEditor::instance()); lua_setglobal (L, "Editor"); @@ -1734,7 +2021,7 @@ LuaCallback::lua_slot (std::string& name, std::string& script, ActionHook& ah, A } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; return false; - } + } catch (...) { } return false; }