mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLuaInstance: Add versions definition for lua api in luainstance.h

Browse Source 
- Version is defined in lua script as APIVERSION.MAJOR, APIVERSION.MINOR
- Set Lua API version to 1.0


Origin commit data
------------------
Commit: 00dff2c598
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-04 (Fri, 04 Sep 2015)
This commit is contained in:
Michael Liebmann
2015-09-04 13:09:34 +02:00
parent c344c7de8c
commit 9c72e8fdc1
6 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gui/luainstance.cpp
View File

@@ -278,6 +278,13 @@ static void set_lua_variables(lua_State *L)
{ NULL, 0 }
};
table_key apiversion[] =
{
{ "MAJOR", LUA_API_VERSION_MAJOR },
{ "MINOR", LUA_API_VERSION_MINOR },
{ NULL, 0 }
};
/* list of environment variable arrays to be exported */
lua_envexport e[] =
{
@@ -286,6 +293,7 @@ static void set_lua_variables(lua_State *L)
{ "FONT", fontlist },
{ "CORNER", corners },
{ "MENU_RETURN", menureturn },
{ "APIVERSION", apiversion },
{ NULL, NULL }
};
@@ -511,6 +519,7 @@ const luaL_Reg CLuaInstance::methods[] =
{ "PlayFile", CLuaInstance::PlayFile },
{ "strFind", CLuaInstance::strFind },
{ "strSub", CLuaInstance::strSub },
{ "checkVersion", CLuaInstance::checkVersion },
{ NULL, NULL }
};
@@ -2611,3 +2620,30 @@ int CLuaInstance::LuaConfigFileDelete(lua_State *L)
}
// --------------------------------------------------------------------------------
int CLuaInstance::checkVersion(lua_State *L)
{
int numargs = lua_gettop(L);
if (numargs < 3) {
printf("CLuaInstance::%s: not enough arguments (%d, expected 2)\n", __func__, numargs);
lua_pushnil(L);
return 1;
}
int major=0, minor=0, ret=1;
major = luaL_checkint(L, 2);
minor = luaL_checkint(L, 3);
if ((major > LUA_API_VERSION_MAJOR) || ((major == LUA_API_VERSION_MAJOR) && (minor > LUA_API_VERSION_MINOR))) {
ret = 0;
char msg[1024];
snprintf(msg, sizeof(msg)-1, "%s (v%d.%d)\n%s v%d.%d",
g_Locale->getText(LOCALE_LUA_VERSIONSCHECK1),
LUA_API_VERSION_MAJOR, LUA_API_VERSION_MINOR,
g_Locale->getText(LOCALE_LUA_VERSIONSCHECK2),
major, minor);
ShowMsg(LOCALE_MESSAGEBOX_ERROR, msg, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_ERROR);
}
lua_pushinteger(L, ret);
return 1;
}
// --------------------------------------------------------------------------------