From 9a9262a47a4225f29ff9476e48ad11a57496426f Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Tue, 8 Dec 2015 06:15:39 +0100 Subject: [PATCH] CLuaInstance: Remove unnecessary function zapitSetStandby() - Set Lua api version to 1.17 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d0cbf0985ed3d514a4f2f2a00f5376fdc82d8b19 Author: Michael Liebmann Date: 2015-12-08 (Tue, 08 Dec 2015) ------------------ This commit was generated by Migit --- src/gui/luainstance.cpp | 13 ------------- src/gui/luainstance.h | 3 +-- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/gui/luainstance.cpp b/src/gui/luainstance.cpp index 748ae5745..0dcc3fad9 100644 --- a/src/gui/luainstance.cpp +++ b/src/gui/luainstance.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include "luainstance.h" #include @@ -513,7 +512,6 @@ void CLuaInstance::runScript(const char *fileName, std::vector *arg DisplayErrorMessage(lua_tostring(lua, -1), "Lua Script Error:"); if (error_string) *error_string = std::string(lua_tostring(lua, -1)); - g_Zapit->setStandby(false); } } @@ -573,7 +571,6 @@ const luaL_Reg CLuaInstance::methods[] = { "setBlank", CLuaInstance::setBlank }, { "ShowPicture", CLuaInstance::ShowPicture }, { "StopPicture", CLuaInstance::StopPicture }, - { "zapitSetStandby", CLuaInstance::zapitSetStandby }, { "Blit", CLuaInstance::Blit }, { "GetLanguage", CLuaInstance::GetLanguage }, { "runScript", CLuaInstance::runScriptExt }, @@ -907,16 +904,6 @@ int CLuaInstance::StopPicture(lua_State */*L*/) return 0; } -int CLuaInstance::zapitSetStandby(lua_State *L) -{ - bool standby = true; - int numargs = lua_gettop(L); - if (numargs > 1) - standby = _luaL_checkbool(L, 2); - g_Zapit->setStandby(standby); - return 0; -} - int CLuaInstance::PlayFile(lua_State *L) { printf("CLuaInstance::%s %d\n", __func__, lua_gettop(L)); diff --git a/src/gui/luainstance.h b/src/gui/luainstance.h index 2da9110cb..9d44e45b2 100644 --- a/src/gui/luainstance.h +++ b/src/gui/luainstance.h @@ -34,7 +34,7 @@ extern "C" { #include #define LUA_API_VERSION_MAJOR 1 -#define LUA_API_VERSION_MINOR 16 +#define LUA_API_VERSION_MINOR 17 typedef std::pair fontmap_pair_t; typedef std::map fontmap_t; @@ -254,7 +254,6 @@ private: static int setBlank(lua_State *L); static int ShowPicture(lua_State *L); static int StopPicture(lua_State *L); - static int zapitSetStandby(lua_State *L); static int PlayFile(lua_State *L); static int strFind(lua_State *L);