diff options
| -rw-r--r-- | libs/ardour/ardour/luascripting.h | 2 | ||||
| -rw-r--r-- | libs/ardour/luascripting.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/luascripting.h b/libs/ardour/ardour/luascripting.h index 1e7833fc54..52ef85aaa3 100644 --- a/libs/ardour/ardour/luascripting.h +++ b/libs/ardour/ardour/luascripting.h @@ -107,7 +107,7 @@ public: static LuaScriptInfoPtr script_info (const std::string &script); 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 (); private: diff --git a/libs/ardour/luascripting.cc b/libs/ardour/luascripting.cc index e530793ce1..8e9157afe8 100644 --- a/libs/ardour/luascripting.cc +++ b/libs/ardour/luascripting.cc @@ -450,7 +450,7 @@ LuaScripting::try_compile (const std::string& script, const LuaScriptParamList& } 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; l.Print.connect (&LuaScripting::lua_print); @@ -461,7 +461,7 @@ LuaScripting::get_factory_bytecode (const std::string& script) "" " function dump_function (f)" " 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" ); @@ -469,7 +469,7 @@ LuaScripting::get_factory_bytecode (const std::string& script) luabridge::LuaRef lua_dump = luabridge::getGlobal (L, "dump_function"); l.do_command ("dump_function = nil"); // hide it 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()) { return (lua_dump(lua_factory)).cast<std::string> (); |