smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 09:06:33 +01:00
Code Issues Projects Releases Wiki Activity

Allow to use any Lua function factory, produce bytecode

Browse source
This commit is contained in:
Robin Gareus 2017-02-17 18:28:40 +01:00
parent 3b8348f009
commit 149634c2cf
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/luascripting.h
View file

@ -107,7 +107,7 @@ public:
static LuaScriptInfoPtr script_info (const std::string &script); static LuaScriptInfoPtr script_info (const std::string &script);
static bool try_compile (const std::string&, const LuaScriptParamList&); static bool try_compile (const std::string&, const LuaScriptParamList&);
static std::string get_factory_bytecode (const std::string&); static std::string get_factory_bytecode (const std::string&, const std::string& ffn = "factory", const std::string& fp = "f");
static std::string user_script_dir (); static std::string user_script_dir ();
private: private:

6
libs/ardour/luascripting.cc
View file

@ -450,7 +450,7 @@ LuaScripting::try_compile (const std::string& script, const LuaScriptParamList&
} }
std::string std::string
LuaScripting::get_factory_bytecode (const std::string& script) LuaScripting::get_factory_bytecode (const std::string& script, const std::string& ffn, const std::string& fp)
{ {
LuaState l; LuaState l;
l.Print.connect (&LuaScripting::lua_print); l.Print.connect (&LuaScripting::lua_print);
@ -461,7 +461,7 @@ LuaScripting::get_factory_bytecode (const std::string& script)
"" ""
" function dump_function (f)" " function dump_function (f)"
" assert(type(f) == 'function', 'Factory is a not a function')" " assert(type(f) == 'function', 'Factory is a not a function')"
" return string.format(\"f = %q\", string.dump(f, true))" " return string.format(\"" + fp + " = %q\", string.dump(f, true))"
" end" " end"
); );
@ -469,7 +469,7 @@ LuaScripting::get_factory_bytecode (const std::string& script)
luabridge::LuaRef lua_dump = luabridge::getGlobal (L, "dump_function"); luabridge::LuaRef lua_dump = luabridge::getGlobal (L, "dump_function");
l.do_command ("dump_function = nil"); // hide it l.do_command ("dump_function = nil"); // hide it
l.do_command (script); // register "factory" l.do_command (script); // register "factory"
luabridge::LuaRef lua_factory = luabridge::getGlobal (L, "factory"); luabridge::LuaRef lua_factory = luabridge::getGlobal (L, ffn.c_str());
if (lua_factory.isFunction()) { if (lua_factory.isFunction()) {
return (lua_dump(lua_factory)).cast<std::string> (); return (lua_dump(lua_factory)).cast<std::string> ();