ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Update Lua instances (2/4) 

This is effectively a NO-OP.
This commit is contained in:
Robin Gareus 2023-10-04 01:25:04 +02:00
parent 7c10a54334
commit 6b3f25eb2a
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/luaproc.cc
View File

@ -51,7 +51,7 @@ LuaProc::LuaProc (AudioEngine& engine,
#ifdef USE_TLSF
, lua (lua_newstate (&PBD::TLSF::lalloc, &_mempool))
#elif defined USE_MALLOC
, lua ()
, lua (true, true)
#else
, lua (lua_newstate (&PBD::ReallocPool::lalloc, &_mempool))
#endif
@ -87,7 +87,7 @@ LuaProc::LuaProc (const LuaProc &other)
#ifdef USE_TLSF
, lua (lua_newstate (&PBD::TLSF::lalloc, &_mempool))
#elif defined USE_MALLOC
, lua ()
, lua (true, true)
#else
, lua (lua_newstate (&PBD::ReallocPool::lalloc, &_mempool))
#endif
@ -176,8 +176,6 @@ LuaProc::init ()
luabridge::push <LuaProc *> (L, this);
lua_setglobal (L, "self");
// sandbox
lua.sandbox (true);
#if 0
lua.do_command ("for n in pairs(_G) do print(n) end print ('----')"); // print global env
#endif

12
libs/ardour/luascripting.cc
View File

@ -184,7 +184,7 @@ LuaScripting::lua_print (std::string s) {
LuaScriptInfoPtr
LuaScripting::scan_script (const std::string &fn, const std::string &sc)
{
LuaState lua;
LuaState lua (true, true);
if (!(fn.empty() ^ sc.empty())){
// give either file OR script
assert (0);
@ -193,7 +193,6 @@ LuaScripting::scan_script (const std::string &fn, const std::string &sc)
lua_State* L = lua.getState();
lua.Print.connect (&LuaScripting::lua_print);
lua.sandbox (true);
lua.do_command (
"ardourluainfo = {}"
@ -392,7 +391,7 @@ LuaScriptParams::script_params (const LuaScriptInfoPtr& lsi, const std::string &
LuaScriptParamList
LuaScriptParams::script_params (const std::string& s, const std::string &pname, bool file)
{
LuaState lua;
LuaState lua (true, true);
return LuaScriptParams::script_params (lua, s, pname, file);
}
@ -402,7 +401,6 @@ LuaScriptParams::script_params (LuaState& lua, const std::string& s, const std::
LuaScriptParamList rv;
lua_State* L = lua.getState();
lua.sandbox (true);
lua.do_command ("function ardour () end");
try {
@ -481,9 +479,8 @@ LuaScripting::try_compile (const std::string& script, const LuaScriptParamList&
if (bytecode.empty()) {
return false;
}
LuaState l;
LuaState l (true, true);
l.Print.connect (&LuaScripting::lua_print);
l.sandbox (true);
lua_State* L = l.getState();
l.do_command (""
@ -520,9 +517,8 @@ LuaScripting::try_compile (const std::string& script, const LuaScriptParamList&
std::string
LuaScripting::get_factory_bytecode (const std::string& script, const std::string& ffn, const std::string& fp)
{
LuaState l;
LuaState l (true, true);
l.Print.connect (&LuaScripting::lua_print);
l.sandbox (true);
lua_State* L = l.getState();
l.do_command (

1
libs/ardour/session.cc
View File

@ -5309,7 +5309,6 @@ void
Session::setup_lua ()
{
lua.Print.connect (&_lua_print);
lua.sandbox (true);
lua.do_command (
"function ArdourSession ()"
" local self = { scripts = {}, instances = {} }"

4
luasession/luasession.cc
View File

@ -416,7 +416,7 @@ setup_lua ()
{
assert (!lua);
lua = new LuaState ();
lua = new LuaState (false, false);
lua->Print.connect (&my_lua_print);
lua_State* L = lua->getState ();
@ -491,7 +491,7 @@ interactive_interpreter ()
}
do {
LuaState lt;
LuaState lt (false, false);
lua_State* L = lt.getState ();
int status = luaL_loadbuffer (L, line, strlen (line), "=stdin");
if (!incomplete (L, status)) {