smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-14 18:46:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix MSVC builds (binding external static members)

Browse source 
This Revert "Lua GUI Instance update: prepare for template scripts"
commit c37cdf548d.
This commit is contained in:
Robin Gareus 2017-08-11 17:58:26 +02:00
parent acd73a9bf8
commit 7d48e80e5f
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour_ui.cc
View file

@ -3935,7 +3935,6 @@ ARDOUR_UI::meta_session_setup (const std::string& script_path)
} }
LuaState lua; LuaState lua;
lua.Print.connect (&LuaInstance::_lua_print);
lua.sandbox (true); lua.sandbox (true);
lua_State* L = lua.getState(); lua_State* L = lua.getState();

6
gtk2_ardour/luainstance.cc
View file

@ -974,9 +974,7 @@ using namespace ARDOUR_UI_UTILS;
using namespace PBD; using namespace PBD;
using namespace std; using namespace std;
void static void _lua_print (std::string s) {
LuaInstance::_lua_print (std::string s)
{
#ifndef NDEBUG #ifndef NDEBUG
std::cout << "LuaInstance: " << s << "\n"; std::cout << "LuaInstance: " << s << "\n";
#endif #endif
@ -1750,7 +1748,7 @@ LuaCallback::get_state (void)
void void
LuaCallback::init (void) LuaCallback::init (void)
{ {
lua.Print.connect (&LuaInstance::_lua_print); lua.Print.connect (&_lua_print);
lua.sandbox (false); lua.sandbox (false);
lua.do_command ( lua.do_command (

2
gtk2_ardour/luainstance.h
View file

@ -91,8 +91,6 @@ public:
static void render_action_icon (cairo_t* cr, int w, int h, uint32_t c, void* i); static void render_action_icon (cairo_t* cr, int w, int h, uint32_t c, void* i);
static void _lua_print (std::string s);
void set_session (ARDOUR::Session* s); void set_session (ARDOUR::Session* s);
int set_state (const XMLNode&); int set_state (const XMLNode&);