From 4d2a2594f00e3ba15616378f5798a25a89e98c17 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 21 Mar 2016 18:57:20 +0100 Subject: [PATCH] move std bindings out of "ARDOUR" into "C" namespace, fix Reference Params --- libs/ardour/luabindings.cc | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index 38e9d4674b..339130c449 100644 --- a/libs/ardour/luabindings.cc +++ b/libs/ardour/luabindings.cc @@ -72,38 +72,26 @@ LuaBindings::stddef (lua_State* L) { // std::list luabridge::getGlobalNamespace (L) - .beginNamespace ("ARDOUR") + .beginNamespace ("C") .beginStdList ("StringList") .endClass () - .endNamespace (); // std::vector - luabridge::getGlobalNamespace (L) - .beginNamespace ("ARDOUR") .beginStdVector ("StringVector") .endClass () - .endNamespace (); // register float array (float*) - luabridge::getGlobalNamespace (L) - .beginNamespace ("ARDOUR") .registerArray ("FloatArray") - .endNamespace (); // register float array (int32_t*) - luabridge::getGlobalNamespace (L) - .beginNamespace ("ARDOUR") .registerArray ("IntArray") - .endNamespace (); // std::vector - luabridge::getGlobalNamespace (L) - .beginNamespace ("ARDOUR") .beginStdVector ("DoubleVector") .endClass () - .endNamespace (); // TODO std::set + .endNamespace (); } void @@ -244,7 +232,7 @@ LuaBindings::common (lua_State* L) .addFunction ("data_type", &Region::data_type) .addFunction ("stretch", &Region::stretch) .addFunction ("shift", &Region::shift) - .addFunction ("sync_offset", &Region::sync_offset) + .addRefFunction ("sync_offset", &Region::sync_offset) .addFunction ("sync_position", &Region::sync_position) .addFunction ("hidden", &Region::hidden) .addFunction ("muted", &Region::muted) @@ -355,7 +343,7 @@ LuaBindings::common (lua_State* L) .addFunction ("name", &Plugin::name) .addFunction ("maker", &Plugin::maker) .addFunction ("parameter_count", &Plugin::parameter_count) - .addFunction ("nth_parameter", &Plugin::nth_parameter) + .addRefFunction ("nth_parameter", &Plugin::nth_parameter) .addFunction ("preset_by_label", &Plugin::preset_by_label) .addFunction ("preset_by_uri", &Plugin::preset_by_uri) .addFunction ("load_preset", &Plugin::load_preset) @@ -499,13 +487,11 @@ LuaBindings::common (lua_State* L) .endClass() .beginStdVector ("BackendVector").endClass () - .beginNamespace ("ARDOUR") .beginClass ("DeviceStatus") .addData ("name", &AudioBackend::DeviceStatus::name) .addData ("available", &AudioBackend::DeviceStatus::available) .endClass() .beginStdVector ("DeviceStatusVector").endClass () - .endNamespace () .beginWSPtrClass ("AudioBackend") .addFunction ("info", &AudioBackend::info)