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

CLuaInstance: Remove unnecessary function zapitSetStandby()

Browse Source 
- Set Lua api version to 1.17


Origin commit data
------------------
Branch: ni/coolstream
Commit: d0cbf0985e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2015-12-08 06:15:39 +01:00
parent 76c32d92a8
commit 9a9262a47a
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/luainstance.cpp
View File

@@ -37,7 +37,6 @@
#include <driver/neutrinofonts.h>
#include <driver/pictureviewer/pictureviewer.h>
#include <neutrino.h>
#include <zapit/types.h>
#include "luainstance.h"
#include <video.h>
@@ -513,7 +512,6 @@ void CLuaInstance::runScript(const char *fileName, std::vector<std::string> *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));

3
src/gui/luainstance.h
View File

@@ -34,7 +34,7 @@ extern "C" {
#include <vector>
#define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 16
#define LUA_API_VERSION_MINOR 17
typedef std::pair<lua_Integer, Font*> fontmap_pair_t;
typedef std::map<lua_Integer, Font*> 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);