mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +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: 91fbed7586
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-03 00:07:20 +01:00
parent 52d1c476c0 65cb3b3dad
commit 55c039615f
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/lua/lua_api_version.h
View File

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

14
src/gui/lua/luainstance.cpp
View File

@@ -273,6 +273,19 @@ static void set_lua_variables(lua_State *L)
{ NULL, 0 } { NULL, 0 }
}; };
/* offsets, exported as e.g. OFFSET['SHADOW'] */
table_key offsets[] =
{
{ "SHADOW", OFFSET_SHADOW },
{ "INTER", OFFSET_INTER },
{ "INNER_LARGE", OFFSET_INNER_LARGE },
{ "INNER_MID", OFFSET_INNER_MID },
{ "INNER_SMALL", OFFSET_INNER_SMALL },
{ "INNER_MIN", OFFSET_INNER_MIN },
{ "INNER_NONE", OFFSET_INNER_NONE },
{ NULL, 0 }
};
/* screen offsets, exported as e.g. SCREEN['END_Y'] */ /* screen offsets, exported as e.g. SCREEN['END_Y'] */
lua_Integer xRes = (lua_Integer)CFrameBuffer::getInstance()->getScreenWidth(true); lua_Integer xRes = (lua_Integer)CFrameBuffer::getInstance()->getScreenWidth(true);
lua_Integer yRes = (lua_Integer)CFrameBuffer::getInstance()->getScreenHeight(true); lua_Integer yRes = (lua_Integer)CFrameBuffer::getInstance()->getScreenHeight(true);
@@ -375,6 +388,7 @@ static void set_lua_variables(lua_State *L)
{ "SCREEN", screenopts }, { "SCREEN", screenopts },
{ "FONT", fontlist }, { "FONT", fontlist },
{ "CORNER", corners }, { "CORNER", corners },
{ "OFFSET", offsets },
{ "MENU_RETURN", menureturn }, { "MENU_RETURN", menureturn },
{ "APIVERSION", apiversion }, { "APIVERSION", apiversion },
{ "PLAYSTATE", playstate }, { "PLAYSTATE", playstate },

3
src/neutrino.cpp
View File

@@ -511,7 +511,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
if (timer_remotebox_itemcount) { if (timer_remotebox_itemcount) {
for (int i = 0; i < timer_remotebox_itemcount; i++) { for (int i = 0; i < timer_remotebox_itemcount; i++) {
timer_remotebox_item timer_rb; timer_remotebox_item timer_rb;
memset(&timer_rb, 0, sizeof(struct timer_remotebox_item)); timer_rb.online = false;
timer_rb.port = 0;
std::string k; std::string k;
k = "timer_remotebox_ip_" + to_string(i); k = "timer_remotebox_ip_" + to_string(i);
timer_rb.rbaddress = configfile.getString(k, ""); timer_rb.rbaddress = configfile.getString(k, "");