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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c8ea9793f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-06 21:18:48 +02:00
parent e6ea52135d e236578f8d
commit e4656e148b
20 changed files with 220 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/movieplayer.cpp
View File

@@ -771,11 +771,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();
@@ -2191,7 +2191,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);