From 7d48e80e5f9a571f76181cc4cb95f1d8a26635a8 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 11 Aug 2017 17:58:26 +0200 Subject: [PATCH] Fix MSVC builds (binding external static members) This Revert "Lua GUI Instance update: prepare for template scripts" commit c37cdf548d14b01744ff560217fb55958e6992fc. --- gtk2_ardour/ardour_ui.cc | 1 - gtk2_ardour/luainstance.cc | 6 ++---- gtk2_ardour/luainstance.h | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 0748d418c2..486559816c 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3935,7 +3935,6 @@ ARDOUR_UI::meta_session_setup (const std::string& script_path) } LuaState lua; - lua.Print.connect (&LuaInstance::_lua_print); lua.sandbox (true); lua_State* L = lua.getState(); diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index cfa380e700..15ab49e884 100644 --- a/gtk2_ardour/luainstance.cc +++ b/gtk2_ardour/luainstance.cc @@ -974,9 +974,7 @@ using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace std; -void -LuaInstance::_lua_print (std::string s) -{ +static void _lua_print (std::string s) { #ifndef NDEBUG std::cout << "LuaInstance: " << s << "\n"; #endif @@ -1750,7 +1748,7 @@ LuaCallback::get_state (void) void LuaCallback::init (void) { - lua.Print.connect (&LuaInstance::_lua_print); + lua.Print.connect (&_lua_print); lua.sandbox (false); lua.do_command ( diff --git a/gtk2_ardour/luainstance.h b/gtk2_ardour/luainstance.h index a96cda10d6..60bbca7c88 100644 --- a/gtk2_ardour/luainstance.h +++ b/gtk2_ardour/luainstance.h @@ -91,8 +91,6 @@ public: 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); int set_state (const XMLNode&);