CLuaInstance: Fixes occasional problems when exiting the movie player

Reduces debug output in curl
This commit is contained in:
M. Liebmann
2015-12-25 07:49:42 +01:00
parent 6b99596c37
commit 31f2f1275a
4 changed files with 8 additions and 3 deletions

View File

@@ -350,7 +350,7 @@ Example:
return 2;
}
if (silent == false)
if (verbose == true)
printf("%s\n \n", msg.c_str());
lua_pushinteger(L, LUA_CURL_OK);

View File

@@ -35,6 +35,7 @@ class CLuaInstVideo
~CLuaInstVideo() {};
static CLuaInstVideo* getInstance();
static void LuaVideoRegister(lua_State *L);
static int channelRezap(lua_State *L);
/* deprecated functions */
static int setBlank_old(lua_State *L);
@@ -53,7 +54,6 @@ class CLuaInstVideo
static int StopPicture(lua_State *L);
static int PlayFile(lua_State *L);
static int zapitStopPlayBack(lua_State *L);
static int channelRezap(lua_State *L);
static int createChannelIDfromUrl(lua_State *L);
static int getNeutrinoMode(lua_State *L);
static int setSinglePlay(lua_State *L);

View File

@@ -50,6 +50,7 @@
#include "lua_video.h"
extern CPictureViewer * g_PicViewer;
extern cVideo * videoDecoder;
static void set_lua_variables(lua_State *L)
{
@@ -468,7 +469,8 @@ void CLuaInstance::runScript(const char *fileName, std::vector<std::string> *arg
if (CMoviePlayerGui::getInstance().getBlockedFromPlugin()) {
CMoviePlayerGui::getInstance().setBlockedFromPlugin(false);
CMoviePlayerGui::getInstance().restoreNeutrino();
}
} else if (videoDecoder->getBlank())
CLuaInstVideo::getInstance()->channelRezap(lua);
}
}
@@ -671,6 +673,8 @@ int CLuaInstance::GCWindow(lua_State *L)
CMoviePlayerGui::getInstance().setBlockedFromPlugin(false);
CMoviePlayerGui::getInstance().restoreNeutrino();
}
else if (videoDecoder->getBlank())
CLuaInstVideo::getInstance()->channelRezap(L);
delete w->fbwin;
w->rcinput = NULL;

View File

@@ -26,6 +26,7 @@ extern "C" {
#include <lualib.h>
}
#include <driver/fb_window.h>
#include <video_cs.h>
#include <vector>
#include "luainstance_helpers.h"