CLuaInstance: Add script fumction 'scale2Res'

- Set Lua api version to 1.69


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6166f4a6f4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-27 (Mon, 27 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-27 00:20:49 +01:00
parent 1e00a117ad
commit efd889897d
3 changed files with 21 additions and 1 deletions

View File

@@ -4,4 +4,4 @@
* to luainstance.h changes
*/
#define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 68
#define LUA_API_VERSION_MINOR 69

View File

@@ -568,6 +568,7 @@ void LuaInstRegisterFunctions(lua_State *L, bool fromThreads/*=false*/)
{ "saveScreen", CLuaInstance::saveScreen },
{ "restoreScreen", CLuaInstance::restoreScreen },
{ "deleteSavedScreen", CLuaInstance::deleteSavedScreen },
{ "scale2Res", CLuaInstance::scale2Res },
/*
lua_misc.cpp
@@ -1183,4 +1184,22 @@ int CLuaInstance::deleteSavedScreen(lua_State *L)
return 0;
}
int CLuaInstance::scale2Res(lua_State *L)
{
CLuaData *W = CheckData(L, 1);
if (!W || !W->fbwin) return 0;
int value, ret;
value = luaL_checkint(L, 2);
/* Remove this when pu/fb-setmode branch is merged to master */
#ifdef SCALE2RES_DEFINED
ret = CFrameBuffer::getInstance()->scale2Res(value);
#else
ret = value;
#endif
lua_pushinteger(L, ret);
return 1;
}
/* --------------------------------------------------------------- */

View File

@@ -73,6 +73,7 @@ public:
static int saveScreen(lua_State *L);
static int restoreScreen(lua_State *L);
static int deleteSavedScreen(lua_State *L);
static int scale2Res(lua_State *L);
private:
lua_State* lua;