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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d2b763294e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-27 (Mon, 27 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-27 08:00:34 +01:00
parent 9ca012f83a efd889897d
commit 4a8d3bb416
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/lua/luainstance.cpp
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;
}
/* --------------------------------------------------------------- */