diff -Naur script/lua.org/luainterface.cpp script/lua/luainterface.cpp --- script/lua.org/luainterface.cpp 2006-02-23 07:30:36.000000000 -0800 +++ script/lua/luainterface.cpp 2007-10-02 11:09:50.000000000 -0700 @@ -1,6 +1,6 @@ #include "luainterface.h" #include "../scriptengine.h" -#include +#include #include #include "../controlobject.h" @@ -18,11 +18,12 @@ qDebug("Creating Lua interpreter..."); m_L = lua_open(); - luaopen_base(m_L); - luaopen_table(m_L); - luaopen_io(m_L); - luaopen_string(m_L); - luaopen_math(m_L); + //luaopen_base(m_L); + //luaopen_table(m_L); + //luaopen_io(m_L); + //luaopen_string(m_L); + //luaopen_math(m_L); + luaL_openlibs(m_L); tolua_mixxx_open(m_L); diff -Naur script/lua.org/tolua.cpp script/lua/tolua.cpp --- script/lua.org/tolua.cpp 2006-02-23 07:30:36.000000000 -0800 +++ script/lua/tolua.cpp 2007-10-02 09:46:57.000000000 -0700 @@ -1,6 +1,6 @@ /* ** Lua binding: mixxx -** Generated automatically by tolua 5.0a on Sun Feb 19 16:28:07 2006. +** Generated automatically by tolua++-1.0.92 on Tue Oct 2 09:46:57 2007. */ #ifndef __cplusplus @@ -8,10 +8,10 @@ #endif #include "string.h" -#include "tolua.h" +#include "tolua++.h" /* Exported function */ -TOLUA_API int tolua_mixxx_open (lua_State* tolua_S); +TOLUA_API int tolua_mixxx_open (lua_State* tolua_S); #include "../playinterface.h" #include "../scriptengine.h" @@ -23,25 +23,26 @@ } /* method: test of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_test00 static int tolua_mixxx_PlayInterface_test00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'test'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'test'",NULL); #endif - { - self->test(); - } + { + self->test(); + } } return 0; #ifndef TOLUA_RELEASE @@ -50,29 +51,31 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: stop of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_stop00 static int tolua_mixxx_PlayInterface_stop00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isnoobj(tolua_S,3,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnumber(tolua_S,2,0,&tolua_err) || + !tolua_isnoobj(tolua_S,3,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); int channel = ((int) tolua_tonumber(tolua_S,2,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'stop'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'stop'",NULL); #endif - { - self->stop(channel); - } + { + self->stop(channel); + } } return 0; #ifndef TOLUA_RELEASE @@ -81,29 +84,31 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: play of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_play00 static int tolua_mixxx_PlayInterface_play00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isnoobj(tolua_S,3,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnumber(tolua_S,2,0,&tolua_err) || + !tolua_isnoobj(tolua_S,3,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); int channel = ((int) tolua_tonumber(tolua_S,2,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'play'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'play'",NULL); #endif - { - self->play(channel); - } + { + self->play(channel); + } } return 0; #ifndef TOLUA_RELEASE @@ -112,29 +117,31 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: setFader of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_setFader00 static int tolua_mixxx_PlayInterface_setFader00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isnoobj(tolua_S,3,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnumber(tolua_S,2,0,&tolua_err) || + !tolua_isnoobj(tolua_S,3,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); double fade = ((double) tolua_tonumber(tolua_S,2,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'setFader'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'setFader'",NULL); #endif - { - self->setFader(fade); - } + { + self->setFader(fade); + } } return 0; #ifndef TOLUA_RELEASE @@ -143,29 +150,31 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: setTag of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_setTag00 static int tolua_mixxx_PlayInterface_setTag00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isnoobj(tolua_S,3,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnumber(tolua_S,2,0,&tolua_err) || + !tolua_isnoobj(tolua_S,3,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); int tag = ((int) tolua_tonumber(tolua_S,2,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'setTag'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'setTag'",NULL); #endif - { - self->setTag(tag); - } + { + self->setTag(tag); + } } return 0; #ifndef TOLUA_RELEASE @@ -174,27 +183,29 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: clearTag of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_clearTag00 static int tolua_mixxx_PlayInterface_clearTag00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'clearTag'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'clearTag'",NULL); #endif - { - self->clearTag(); - } + { + self->clearTag(); + } } return 0; #ifndef TOLUA_RELEASE @@ -203,27 +214,29 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: kill of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_kill00 static int tolua_mixxx_PlayInterface_kill00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'kill'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'kill'",NULL); #endif - { - self->kill(); - } + { + self->kill(); + } } return 0; #ifndef TOLUA_RELEASE @@ -232,29 +245,31 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: killTag of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_killTag00 static int tolua_mixxx_PlayInterface_killTag00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isnoobj(tolua_S,3,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnumber(tolua_S,2,0,&tolua_err) || + !tolua_isnoobj(tolua_S,3,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); int tag = ((int) tolua_tonumber(tolua_S,2,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'killTag'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'killTag'",NULL); #endif - { - self->killTag(tag); - } + { + self->killTag(tag); + } } return 0; #ifndef TOLUA_RELEASE @@ -263,28 +278,30 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: getFader of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_getFader00 static int tolua_mixxx_PlayInterface_getFader00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'getFader'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'getFader'",NULL); #endif - { - double tolua_ret = (double) self->getFader(); - tolua_pushnumber(tolua_S,(lua_Number)tolua_ret); - } + { + double tolua_ret = (double) self->getFader(); + tolua_pushnumber(tolua_S,(lua_Number)tolua_ret); + } } return 1; #ifndef TOLUA_RELEASE @@ -293,19 +310,21 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: getValue of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_getValue00 static int tolua_mixxx_PlayInterface_getValue00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isstring(tolua_S,2,0,&tolua_err) || - !tolua_isstring(tolua_S,3,0,&tolua_err) || - !tolua_isnoobj(tolua_S,4,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isstring(tolua_S,2,0,&tolua_err) || + !tolua_isstring(tolua_S,3,0,&tolua_err) || + !tolua_isnoobj(tolua_S,4,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { @@ -313,12 +332,12 @@ const char* group = ((const char*) tolua_tostring(tolua_S,2,0)); const char* name = ((const char*) tolua_tostring(tolua_S,3,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'getValue'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'getValue'",NULL); #endif - { - double tolua_ret = (double) self->getValue(group,name); - tolua_pushnumber(tolua_S,(lua_Number)tolua_ret); - } + { + double tolua_ret = (double) self->getValue(group,name); + tolua_pushnumber(tolua_S,(lua_Number)tolua_ret); + } } return 1; #ifndef TOLUA_RELEASE @@ -327,27 +346,29 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: startFadeCrossfader of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_startFadeCrossfader00 static int tolua_mixxx_PlayInterface_startFadeCrossfader00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'startFadeCrossfader'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'startFadeCrossfader'",NULL); #endif - { - self->startFadeCrossfader(); - } + { + self->startFadeCrossfader(); + } } return 0; #ifndef TOLUA_RELEASE @@ -356,19 +377,21 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: startList of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_startList00 static int tolua_mixxx_PlayInterface_startList00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isstring(tolua_S,2,0,&tolua_err) || - !tolua_isstring(tolua_S,3,0,&tolua_err) || - !tolua_isnoobj(tolua_S,4,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isstring(tolua_S,2,0,&tolua_err) || + !tolua_isstring(tolua_S,3,0,&tolua_err) || + !tolua_isnoobj(tolua_S,4,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { @@ -376,11 +399,11 @@ const char* group = ((const char*) tolua_tostring(tolua_S,2,0)); const char* name = ((const char*) tolua_tostring(tolua_S,3,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'startList'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'startList'",NULL); #endif - { - self->startList(group,name); - } + { + self->startList(group,name); + } } return 0; #ifndef TOLUA_RELEASE @@ -389,19 +412,21 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: startFade of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_startFade00 static int tolua_mixxx_PlayInterface_startFade00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isstring(tolua_S,2,0,&tolua_err) || - !tolua_isstring(tolua_S,3,0,&tolua_err) || - !tolua_isnoobj(tolua_S,4,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isstring(tolua_S,2,0,&tolua_err) || + !tolua_isstring(tolua_S,3,0,&tolua_err) || + !tolua_isnoobj(tolua_S,4,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { @@ -409,11 +434,11 @@ const char* group = ((const char*) tolua_tostring(tolua_S,2,0)); const char* name = ((const char*) tolua_tostring(tolua_S,3,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'startFade'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'startFade'",NULL); #endif - { - self->startFade(group,name); - } + { + self->startFade(group,name); + } } return 0; #ifndef TOLUA_RELEASE @@ -422,19 +447,21 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: point of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_point00 static int tolua_mixxx_PlayInterface_point00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isnumber(tolua_S,3,0,&tolua_err) || - !tolua_isnoobj(tolua_S,4,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnumber(tolua_S,2,0,&tolua_err) || + !tolua_isnumber(tolua_S,3,0,&tolua_err) || + !tolua_isnoobj(tolua_S,4,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { @@ -442,11 +469,11 @@ int time = ((int) tolua_tonumber(tolua_S,2,0)); double value = ((double) tolua_tonumber(tolua_S,3,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'point'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'point'",NULL); #endif - { - self->point(time,value); - } + { + self->point(time,value); + } } return 0; #ifndef TOLUA_RELEASE @@ -455,19 +482,21 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: fadePoint of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_fadePoint00 static int tolua_mixxx_PlayInterface_fadePoint00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isnumber(tolua_S,3,0,&tolua_err) || - !tolua_isnoobj(tolua_S,4,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnumber(tolua_S,2,0,&tolua_err) || + !tolua_isnumber(tolua_S,3,0,&tolua_err) || + !tolua_isnoobj(tolua_S,4,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { @@ -475,11 +504,11 @@ int time = ((int) tolua_tonumber(tolua_S,2,0)); double value = ((double) tolua_tonumber(tolua_S,3,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'fadePoint'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'fadePoint'",NULL); #endif - { - self->fadePoint(time,value); - } + { + self->fadePoint(time,value); + } } return 0; #ifndef TOLUA_RELEASE @@ -488,27 +517,29 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: endFade of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_endFade00 static int tolua_mixxx_PlayInterface_endFade00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'endFade'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'endFade'",NULL); #endif - { - self->endFade(); - } + { + self->endFade(); + } } return 0; #ifndef TOLUA_RELEASE @@ -517,27 +548,29 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: endList of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_endList00 static int tolua_mixxx_PlayInterface_endList00(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnoobj(tolua_S,2,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { PlayInterface* self = (PlayInterface*) tolua_tousertype(tolua_S,1,0); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'endList'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'endList'",NULL); #endif - { - self->endList(); - } + { + self->endList(); + } } return 0; #ifndef TOLUA_RELEASE @@ -546,19 +579,21 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: playChannel1 of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_playChannel100 static int tolua_mixxx_PlayInterface_playChannel100(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isstring(tolua_S,3,0,&tolua_err) || - !tolua_isnoobj(tolua_S,4,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnumber(tolua_S,2,0,&tolua_err) || + !tolua_isstring(tolua_S,3,0,&tolua_err) || + !tolua_isnoobj(tolua_S,4,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { @@ -566,11 +601,11 @@ int time = ((int) tolua_tonumber(tolua_S,2,0)); char* path = ((char*) tolua_tostring(tolua_S,3,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'playChannel1'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'playChannel1'",NULL); #endif - { - self->playChannel1(time,path); - } + { + self->playChannel1(time,path); + } } return 0; #ifndef TOLUA_RELEASE @@ -579,19 +614,21 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* method: playChannel2 of class PlayInterface */ +#ifndef TOLUA_DISABLE_tolua_mixxx_PlayInterface_playChannel200 static int tolua_mixxx_PlayInterface_playChannel200(lua_State* tolua_S) { #ifndef TOLUA_RELEASE tolua_Error tolua_err; if ( - !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || - !tolua_isnumber(tolua_S,2,0,&tolua_err) || - !tolua_isstring(tolua_S,3,0,&tolua_err) || - !tolua_isnoobj(tolua_S,4,&tolua_err) + !tolua_isusertype(tolua_S,1,"PlayInterface",0,&tolua_err) || + !tolua_isnumber(tolua_S,2,0,&tolua_err) || + !tolua_isstring(tolua_S,3,0,&tolua_err) || + !tolua_isnoobj(tolua_S,4,&tolua_err) ) - goto tolua_lerror; + goto tolua_lerror; else #endif { @@ -599,11 +636,11 @@ int time = ((int) tolua_tonumber(tolua_S,2,0)); char* path = ((char*) tolua_tostring(tolua_S,3,0)); #ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'playChannel2'",NULL); + if (!self) tolua_error(tolua_S,"invalid 'self' in function 'playChannel2'",NULL); #endif - { - self->playChannel2(time,path); - } + { + self->playChannel2(time,path); + } } return 0; #ifndef TOLUA_RELEASE @@ -612,6 +649,7 @@ return 0; #endif } +#endif //#ifndef TOLUA_DISABLE /* Open function */ TOLUA_API int tolua_mixxx_open (lua_State* tolua_S) @@ -620,28 +658,36 @@ tolua_reg_types(tolua_S); tolua_module(tolua_S,NULL,0); tolua_beginmodule(tolua_S,NULL); - tolua_cclass(tolua_S,"PlayInterface","PlayInterface","",NULL); - tolua_beginmodule(tolua_S,"PlayInterface"); - tolua_function(tolua_S,"test",tolua_mixxx_PlayInterface_test00); - tolua_function(tolua_S,"stop",tolua_mixxx_PlayInterface_stop00); - tolua_function(tolua_S,"play",tolua_mixxx_PlayInterface_play00); - tolua_function(tolua_S,"setFader",tolua_mixxx_PlayInterface_setFader00); - tolua_function(tolua_S,"setTag",tolua_mixxx_PlayInterface_setTag00); - tolua_function(tolua_S,"clearTag",tolua_mixxx_PlayInterface_clearTag00); - tolua_function(tolua_S,"kill",tolua_mixxx_PlayInterface_kill00); - tolua_function(tolua_S,"killTag",tolua_mixxx_PlayInterface_killTag00); - tolua_function(tolua_S,"getFader",tolua_mixxx_PlayInterface_getFader00); - tolua_function(tolua_S,"getValue",tolua_mixxx_PlayInterface_getValue00); - tolua_function(tolua_S,"startFadeCrossfader",tolua_mixxx_PlayInterface_startFadeCrossfader00); - tolua_function(tolua_S,"startList",tolua_mixxx_PlayInterface_startList00); - tolua_function(tolua_S,"startFade",tolua_mixxx_PlayInterface_startFade00); - tolua_function(tolua_S,"point",tolua_mixxx_PlayInterface_point00); - tolua_function(tolua_S,"fadePoint",tolua_mixxx_PlayInterface_fadePoint00); - tolua_function(tolua_S,"endFade",tolua_mixxx_PlayInterface_endFade00); - tolua_function(tolua_S,"endList",tolua_mixxx_PlayInterface_endList00); - tolua_function(tolua_S,"playChannel1",tolua_mixxx_PlayInterface_playChannel100); - tolua_function(tolua_S,"playChannel2",tolua_mixxx_PlayInterface_playChannel200); - tolua_endmodule(tolua_S); + tolua_cclass(tolua_S,"PlayInterface","PlayInterface","",NULL); + tolua_beginmodule(tolua_S,"PlayInterface"); + tolua_function(tolua_S,"test",tolua_mixxx_PlayInterface_test00); + tolua_function(tolua_S,"stop",tolua_mixxx_PlayInterface_stop00); + tolua_function(tolua_S,"play",tolua_mixxx_PlayInterface_play00); + tolua_function(tolua_S,"setFader",tolua_mixxx_PlayInterface_setFader00); + tolua_function(tolua_S,"setTag",tolua_mixxx_PlayInterface_setTag00); + tolua_function(tolua_S,"clearTag",tolua_mixxx_PlayInterface_clearTag00); + tolua_function(tolua_S,"kill",tolua_mixxx_PlayInterface_kill00); + tolua_function(tolua_S,"killTag",tolua_mixxx_PlayInterface_killTag00); + tolua_function(tolua_S,"getFader",tolua_mixxx_PlayInterface_getFader00); + tolua_function(tolua_S,"getValue",tolua_mixxx_PlayInterface_getValue00); + tolua_function(tolua_S,"startFadeCrossfader",tolua_mixxx_PlayInterface_startFadeCrossfader00); + tolua_function(tolua_S,"startList",tolua_mixxx_PlayInterface_startList00); + tolua_function(tolua_S,"startFade",tolua_mixxx_PlayInterface_startFade00); + tolua_function(tolua_S,"point",tolua_mixxx_PlayInterface_point00); + tolua_function(tolua_S,"fadePoint",tolua_mixxx_PlayInterface_fadePoint00); + tolua_function(tolua_S,"endFade",tolua_mixxx_PlayInterface_endFade00); + tolua_function(tolua_S,"endList",tolua_mixxx_PlayInterface_endList00); + tolua_function(tolua_S,"playChannel1",tolua_mixxx_PlayInterface_playChannel100); + tolua_function(tolua_S,"playChannel2",tolua_mixxx_PlayInterface_playChannel200); + tolua_endmodule(tolua_S); tolua_endmodule(tolua_S); return 1; } + + +#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 501 + TOLUA_API int luaopen_mixxx (lua_State* tolua_S) { + return tolua_mixxx_open(tolua_S); +}; +#endif + --- build.definition.org 2007-02-25 12:58:30.000000000 -0800 +++ build.definition 2007-10-02 10:25:59.000000000 -0700 @@ -316,7 +316,7 @@ # SCRIPTING ENGINE -------- -OBJECT=tolua.h +OBJECT=tolua++.h TYPE=header OPTIONS=disable_feature DESCRIPTION=Lua Support --- mixxx.pro.org 2007-10-02 10:36:47.000000000 -0700 +++ mixxx.pro 2007-10-02 10:36:47.000000000 -0700 @@ -481,7 +481,7 @@ contains(ENABLED_FEATURES, lua) { HEADERS += script/lua/*.h SOURCES += script/lua/*.cpp - LIBS+=-llua -llualib -ltolua + LIBS+=-llua -ltolua++ DEFINES += __LUA__ }