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

Fix last commit

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1f08a6012
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-17 15:45:04 +01:00
parent 7c29c4029e
commit c1534ae6b7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/lua/lua_video.cpp
View File

@@ -177,6 +177,8 @@ int CLuaInstVideo::PlayFile(lua_State *L)
CMoviePlayerGui::getInstance().SetFile(st, sf, si1, si2); CMoviePlayerGui::getInstance().SetFile(st, sf, si1, si2);
CMoviePlayerGui::getInstance().exec(NULL, "http_lua"); CMoviePlayerGui::getInstance().exec(NULL, "http_lua");
CMoviePlayerGui::getInstance().setLuaInfoFunc(L, false); CMoviePlayerGui::getInstance().setLuaInfoFunc(L, false);
if (D != NULL && !D->infoFunc.empty())
D->infoFunc = "";
int ret = CMoviePlayerGui::getInstance().getKeyPressed(); int ret = CMoviePlayerGui::getInstance().getKeyPressed();
lua_pushinteger(L, ret); lua_pushinteger(L, ret);
return 1; return 1;

2
src/gui/lua/luainstance.h
View File

@@ -32,7 +32,7 @@ extern "C" {
#if 0 #if 0
#define LUA_API_VERSION_MAJOR 1 #define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 36 #define LUA_API_VERSION_MINOR 37
#endif #endif
void LuaInstRegisterFunctions(lua_State *L, bool fromThreads=false); void LuaInstRegisterFunctions(lua_State *L, bool fromThreads=false);