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

Merge branch 'ni/cst-next' into ni/mp/cst-next

Browse Source 
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-10 17:27:55 +02:00
parent 941e37a5f1 0546f9fcf3
commit ca5c4b00d7
169 changed files with 1683 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/movieplayer.cpp
View File

@@ -799,11 +799,11 @@ bool CMoviePlayerGui::luaGetUrl(const std::string &script, const std::string &fi
std::vector<std::string> args;
args.push_back(file);
#ifdef ENABLE_LUA
CLuaInstance *lua = new CLuaInstance();
lua->runScript(script.c_str(), &args, &result_code, &result_string);
delete lua;
#endif
if ((result_code != "0") || result_string.empty()) {
if (box != NULL) {
box->hide();
@@ -2224,7 +2224,9 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
yres = 1080;
aspectRatio = videoDecoder->getAspectRatio();
}
#ifdef ENABLE_LUA
CLuaInstVideo::getInstance()->execLuaInfoFunc(luaState, xres, yres, aspectRatio, framerate);
#endif
}
else if (p_movie_info)
g_EpgData->show_mp(p_movie_info, position, duration);