len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lua: re-use the viewport pointer; also use the shorter lua_getfield() & lua_setfield() notations (thanks Antoine Cellerier)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21080 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2009-05-25 19:05:53 +00:00
parent b50f18d50c
commit cd5e98db08
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/plugins/lua/rocklib.c
View file

@ -184,8 +184,7 @@ static inline void rli_init(lua_State *L)
/* Helper function for opt_viewport */ /* Helper function for opt_viewport */
static void check_tablevalue(lua_State *L, const char* key, int tablepos, void* res, bool unsigned_val) static void check_tablevalue(lua_State *L, const char* key, int tablepos, void* res, bool unsigned_val)
{ {
lua_pushstring(L, key); /* Push the key on the stack */ lua_getfield(L, tablepos, key); /* Find table[key] */
lua_gettable(L, tablepos); /* Find table[key] (pops key off the stack) */
if(!lua_isnoneornil(L, -1)) if(!lua_isnoneornil(L, -1))
{ {
@ -204,11 +203,22 @@ static struct viewport* opt_viewport(lua_State *L, int narg, struct viewport* al
return alt; return alt;
int tablepos = lua_gettop(L); int tablepos = lua_gettop(L);
struct viewport *vp;
lua_pushliteral(L, "vp"); /* push 'vp' on the stack */ lua_getfield(L, tablepos, "vp"); /* get table['vp'] */
struct viewport *vp = (struct viewport*)lua_newuserdata(L, sizeof(struct viewport)); /* allocate memory and push it as udata on the stack */ if(lua_isnoneornil(L, -1))
{
lua_pop(L, 1); /* Pop nil off stack */
vp = (struct viewport*) lua_newuserdata(L, sizeof(struct viewport)); /* Allocate memory and push it as udata on the stack */
memset(vp, 0, sizeof(struct viewport)); /* Init viewport values to 0 */ memset(vp, 0, sizeof(struct viewport)); /* Init viewport values to 0 */
lua_settable(L, tablepos); /* table['vp'] = vp (pops key & value off the stack) */ lua_setfield(L, tablepos, "vp"); /* table['vp'] = vp (pops value off the stack) */
}
else
{
vp = (struct viewport*) lua_touserdata(L, -1); /* Reuse viewport struct */
lua_pop(L, 1); /* We don't need the value on stack */
}
luaL_checktype(L, narg, LUA_TTABLE); luaL_checktype(L, narg, LUA_TTABLE);