diff options
Diffstat (limited to 'src/lua/modules/audio')
| -rw-r--r-- | src/lua/modules/audio/je_lua_audio.cpp | 12 | ||||
| -rw-r--r-- | src/lua/modules/audio/je_lua_source.cpp | 7 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/lua/modules/audio/je_lua_audio.cpp b/src/lua/modules/audio/je_lua_audio.cpp index b9183b2..61b9556 100644 --- a/src/lua/modules/audio/je_lua_audio.cpp +++ b/src/lua/modules/audio/je_lua_audio.cpp @@ -1,5 +1,4 @@ -#include "LuaJIT/lua.hpp" -#include "libraries/luax/luax.h" +#include "common/je_lua.h" #include "common/je_lua_common.h" #include "libjin/jin.h" #include "je_lua_source.h" @@ -98,8 +97,7 @@ namespace JinEngine luax_pushnil(L); return 1; } - Proxy* proxy = luax_newinstance(L, Jin_Lua_Source); - proxy->bind(new Shared<Source>(src, Jin_Lua_Source)); + Proxy* proxy = luax_newinstance(L, Jin_Lua_Source, new Shared<Source>(src, Jin_Lua_Source)); return 1; } @@ -114,7 +112,7 @@ namespace JinEngine { luaopen_Source(L); - luaL_Reg f[] = { + luaL_Reg methods[] = { { "init", l_init }, { "play", l_play }, { "stop", l_stop }, @@ -125,9 +123,7 @@ namespace JinEngine { "destroy", l_destroy }, { 0, 0 } }; - - luax_newlib(L, f); - + luax_newlib(L, methods); return 1; } diff --git a/src/lua/modules/audio/je_lua_source.cpp b/src/lua/modules/audio/je_lua_source.cpp index 5058690..0e7b09e 100644 --- a/src/lua/modules/audio/je_lua_source.cpp +++ b/src/lua/modules/audio/je_lua_source.cpp @@ -1,6 +1,5 @@ #include "libjin/jin.h" -#include "LuaJIT/lua.hpp" -#include "libraries/luax/luax.h" +#include "common/je_lua.h" #include "common/je_lua_common.h" using namespace JinEngine::Audio; @@ -96,7 +95,7 @@ namespace JinEngine LUA_EXPORT void luaopen_Source(lua_State* L) { - luaL_Reg f[] = { + luaL_Reg methods[] = { { "__gc", l_gc }, { "play", l_play }, { "stop", l_stop }, @@ -110,7 +109,7 @@ namespace JinEngine { 0, 0 } }; - luax_newtype(L, Jin_Lua_Source, f); + luax_newtype(L, Jin_Lua_Source, methods); } } // namespace Lua |