mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "CLuaInstance: Fix compiler warnings"

Browse Source 
This reverts commit 87031add94.

This is wrong in so many aspects... just look up the definition
of lua_integer...
This commit is contained in:
Stefan Seyfried
2014-01-23 14:12:15 +01:00
committed by Jacek Jendrzej
parent 94558db6f8
commit 4da2a33b29
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/luainstance.cpp
View File

@@ -39,7 +39,7 @@
struct table_key {
const char *name;
uint32_t code;
long code;
};
struct lua_envexport {
@@ -224,20 +224,20 @@ static void set_lua_variables(lua_State *L)
{ "TOP_RIGHT", CORNER_TOP_RIGHT },
{ "BOTTOM_LEFT", CORNER_BOTTOM_LEFT },
{ "BOTTOM_RIGHT", CORNER_BOTTOM_RIGHT },
{ "RADIUS_LARGE", (uint32_t) RADIUS_LARGE }, /* those depend on g_settings.rounded_corners */
{ "RADIUS_MID", (uint32_t) RADIUS_MID },
{ "RADIUS_SMALL", (uint32_t) RADIUS_SMALL },
{ "RADIUS_MIN", (uint32_t) RADIUS_MIN },
{ "RADIUS_LARGE", RADIUS_LARGE }, /* those depend on g_settings.rounded_corners */
{ "RADIUS_MID", RADIUS_MID },
{ "RADIUS_SMALL", RADIUS_SMALL },
{ "RADIUS_MIN", RADIUS_MIN },
{ NULL, 0 }
};
/* screen offsets, exported as e.g. SCREEN['END_Y'] */
table_key screenopts[] =
{
{ "OFF_X", (uint32_t) g_settings.screen_StartX },
{ "OFF_Y", (uint32_t) g_settings.screen_StartY },
{ "END_X", (uint32_t) g_settings.screen_EndX },
{ "END_Y", (uint32_t) g_settings.screen_EndY },
{ "OFF_X", g_settings.screen_StartX },
{ "OFF_Y", g_settings.screen_StartY },
{ "END_X", g_settings.screen_EndX },
{ "END_Y", g_settings.screen_EndY },
{ NULL, 0 }
};
table_key menureturn[] =
@@ -696,7 +696,7 @@ bool CLuaMenuChangeObserver::changeNotify(lua_State *L, const std::string &luaAc
lua_pushstring(L, luaId.c_str());
lua_pushstring(L, optionValue);
lua_pcall(L, 2 /* two args */, 1 /* one result */, 0);
int res = lua_isnumber(L, -1) ? (int)lua_tonumber(L, -1) : 0;
double res = lua_isnumber(L, -1) ? lua_tonumber(L, -1) : 0;
lua_pop(L, 2);
return ((res == menu_return::RETURN_REPAINT) || (res == menu_return::RETURN_EXIT_REPAINT));
}
@@ -1275,7 +1275,7 @@ int CLuaInstance::MessageboxExec(lua_State *L)
tmp = "cancel";
for (int i = 0; mbr[i].name; i++)
if ((uint32_t)res == mbr[i].code) {
if (res == mbr[i].code) {
tmp = mbr[i].name;
break;
}