summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-04-06 17:03:28 +0200
committerRobin Gareus <robin@gareus.org>2016-04-06 17:03:28 +0200
commit165ae0863a84b9c8ed5da19daee0fe1197dbaea6 (patch)
tree85855bc90f948bb2e8b100ef1a70c0494e6c463f
parent00ecc545bc6b0ab025a405a9cbf3036b9d4b0a6d (diff)
consistent lua binding name (nil is a reserved word in lua)
-rw-r--r--libs/ardour/ardour/lua_api.h5
-rw-r--r--libs/ardour/lua_api.cc2
-rw-r--r--libs/ardour/luabindings.cc2
3 files changed, 3 insertions, 6 deletions
diff --git a/libs/ardour/ardour/lua_api.h b/libs/ardour/ardour/lua_api.h
index 953c333fcd..574ddd24a5 100644
--- a/libs/ardour/ardour/lua_api.h
+++ b/libs/ardour/ardour/lua_api.h
@@ -31,17 +31,14 @@
namespace ARDOUR { namespace LuaAPI {
/** convenience contructor for DataType::NIL
- * @param lua ignored
* @returns DataType::NIL
*/
- int datatype_ctor_nil (lua_State *lua);
+ int datatype_ctor_null (lua_State *lua);
/** convenience contructor for DataType::AUDIO
- * @param lua ignored
* @returns DataType::AUDIO
*/
int datatype_ctor_audio (lua_State *L);
/** convenience contructor for DataType::MIDI
- * @param lua ignored
* @returns DataType::MIDI
*/
int datatype_ctor_midi (lua_State *L);
diff --git a/libs/ardour/lua_api.cc b/libs/ardour/lua_api.cc
index 3bd4fc43f6..8a52a2ccb7 100644
--- a/libs/ardour/lua_api.cc
+++ b/libs/ardour/lua_api.cc
@@ -37,7 +37,7 @@ using namespace PBD;
using namespace std;
int
-ARDOUR::LuaAPI::datatype_ctor_nil (lua_State *L)
+ARDOUR::LuaAPI::datatype_ctor_null (lua_State *L)
{
DataType dt (DataType::NIL);
luabridge::Stack <DataType>::push (L, dt);
diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index 9dca147bb2..e2144d35b0 100644
--- a/libs/ardour/luabindings.cc
+++ b/libs/ardour/luabindings.cc
@@ -489,7 +489,7 @@ LuaBindings::common (lua_State* L)
.beginClass <DataType> ("DataType")
.addConstructor <void (*) (std::string)> ()
- .addStaticCFunction ("null", &LuaAPI::datatype_ctor_nil) // "nil" is a lua reseved word
+ .addStaticCFunction ("null", &LuaAPI::datatype_ctor_null) // "nil" is a lua reseved word
.addStaticCFunction ("audio", &LuaAPI::datatype_ctor_audio)
.addStaticCFunction ("midi", &LuaAPI::datatype_ctor_midi)
.endClass()