X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fluainstance.cc;h=156ad11d349e4a277885944f6c1fe0bd7f490dc6;hb=12a510271306df4af7a7db241ed7cf07f35fdf06;hp=7f77558f11cde9c0595c3a9e16d83bb211f3c3fd;hpb=ffcb0af8bc5a60cabc1224d2c562f719d405c3bf;p=ardour.git diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index 7f77558f11..156ad11d34 100644 --- a/gtk2_ardour/luainstance.cc +++ b/gtk2_ardour/luainstance.cc @@ -23,10 +23,12 @@ #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" @@ -370,12 +372,76 @@ 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 +//////////////////////////////////////////////////////////////////////////////// + +// 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) @@ -397,6 +463,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 @@ -604,7 +674,6 @@ LuaInstance::register_classes (lua_State* L) bind_cairo (L); bind_dialog (L); - register_hooks (L); luabridge::getGlobalNamespace (L) .beginNamespace ("ArdourUI") @@ -659,14 +728,14 @@ LuaInstance::register_classes (lua_State* L) .beginClass ("RegionSelection") .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 () @@ -846,9 +915,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)) @@ -870,7 +949,14 @@ LuaInstance::register_classes (lua_State* L) .addConst ("Add", Selection::Operation(Selection::Add)) .endNamespace () - .endNamespace (); // end ArdourUI + .endNamespace () // end ArdourUI + + .beginNamespace ("os") +#ifndef PLATFORM_WINDOWS + .addFunction ("execute", &lua_exec) +#endif + .addCFunction ("forkexec", &lua_forkexec) + .endNamespace (); // Editing Symbols @@ -958,6 +1044,7 @@ LuaInstance::~LuaInstance () void LuaInstance::init () { + lua.sandbox (false); lua.do_command ( "function ScriptManager ()" " local self = { scripts = {}, instances = {}, icons = {} }" @@ -975,7 +1062,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)" @@ -1076,7 +1163,6 @@ LuaInstance::init () " manager = ScriptManager ()" " ScriptManager = nil" ); - lua_State* L = lua.getState(); try { @@ -1094,6 +1180,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; @@ -1101,6 +1192,7 @@ LuaInstance::init () } register_classes (L); + register_hooks (L); luabridge::push (L, &PublicEditor::instance()); lua_setglobal (L, "Editor"); @@ -1120,6 +1212,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 @@ -1160,7 +1253,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)) { @@ -1180,7 +1273,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 (...) { } } } @@ -1230,7 +1323,7 @@ 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 (); @@ -1267,10 +1360,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; @@ -1317,7 +1414,7 @@ LuaInstance::call_action (const int id) lua.collect_garbage_step (); } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } } void @@ -1334,7 +1431,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 @@ -1360,6 +1457,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; @@ -1373,6 +1472,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 (); @@ -1394,8 +1495,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; } @@ -1425,7 +1525,7 @@ LuaInstance::lua_action_has_icon (const int id) } } catch (luabridge::LuaException const& e) { cerr << "LuaException:" << e.what () << endl; - } + } catch (...) { } return false; } @@ -1460,8 +1560,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; } @@ -1473,6 +1572,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"); @@ -1483,7 +1583,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; @@ -1500,7 +1600,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; } @@ -1586,11 +1686,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 (); @@ -1629,7 +1731,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); @@ -1679,6 +1781,7 @@ void LuaCallback::init (void) { lua.Print.connect (&_lua_print); + lua.sandbox (false); lua.do_command ( "function ScriptManager ()" @@ -1690,7 +1793,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" "" @@ -1788,6 +1891,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; @@ -1795,6 +1903,7 @@ LuaCallback::init (void) } LuaInstance::register_classes (L); + LuaInstance::register_hooks (L); luabridge::push (L, &PublicEditor::instance()); lua_setglobal (L, "Editor"); @@ -1835,7 +1944,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; }