From 0a008ab308435c8be2304c0c68c29d6cb0ca8204 Mon Sep 17 00:00:00 2001 From: "M. Liebmann" Date: Tue, 8 Dec 2015 06:16:00 +0100 Subject: [PATCH] CLuaInstance: Add script function zapitStopPlayBack - For safe running ShowPicture() in the plugin - Set Lua api version to 1.19 --- src/gui/lua/lua_video.cpp | 16 ++++++++++++++++ src/gui/lua/lua_video.inc | 1 + src/gui/lua/luainstance.cpp | 1 + src/gui/lua/luainstance.h | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/gui/lua/lua_video.cpp b/src/gui/lua/lua_video.cpp index f527b88e2..285d1d68e 100644 --- a/src/gui/lua/lua_video.cpp +++ b/src/gui/lua/lua_video.cpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -97,3 +98,18 @@ int CLuaInstance::PlayFile(lua_State *L) lua_pushinteger(L, ret); return 1; } + +int CLuaInstance::zapitStopPlayBack(lua_State *L) +{ + bool stop = true; + int numargs = lua_gettop(L); + if (numargs > 1) + stop = _luaL_checkbool(L, 2); + if (stop) { + CMoviePlayerGui::getInstance().stopPlayBack(); + g_Zapit->stopPlayBack(); + } + else + g_Zapit->startPlayBack(); + return 0; +} diff --git a/src/gui/lua/lua_video.inc b/src/gui/lua/lua_video.inc index 01ba76707..f4b89f698 100644 --- a/src/gui/lua/lua_video.inc +++ b/src/gui/lua/lua_video.inc @@ -3,3 +3,4 @@ static int setBlank(lua_State *L); static int ShowPicture(lua_State *L); static int StopPicture(lua_State *L); static int PlayFile(lua_State *L); +static int zapitStopPlayBack(lua_State *L); diff --git a/src/gui/lua/luainstance.cpp b/src/gui/lua/luainstance.cpp index 07156505d..552168028 100644 --- a/src/gui/lua/luainstance.cpp +++ b/src/gui/lua/luainstance.cpp @@ -588,6 +588,7 @@ const luaL_Reg CLuaInstance::methods[] = { "ShowPicture", CLuaInstance::ShowPicture }, { "StopPicture", CLuaInstance::StopPicture }, { "PlayFile", CLuaInstance::PlayFile }, + { "zapitStopPlayBack", CLuaInstance::zapitStopPlayBack }, { NULL, NULL } }; diff --git a/src/gui/lua/luainstance.h b/src/gui/lua/luainstance.h index 936580207..766341922 100644 --- a/src/gui/lua/luainstance.h +++ b/src/gui/lua/luainstance.h @@ -34,7 +34,7 @@ extern "C" { #include #define LUA_API_VERSION_MAJOR 1 -#define LUA_API_VERSION_MINOR 18 +#define LUA_API_VERSION_MINOR 19 typedef std::pair fontmap_pair_t; typedef std::map fontmap_t;