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

movieplayer: remove unneeded ifdef ENABLE_LUA

Browse Source 
Origin commit data
------------------
Commit: 4c65ebbd73
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-30 (Sat, 30 Dec 2017)

Origin message was:
------------------
- movieplayer: remove unneeded ifdef ENABLE_LUA
This commit is contained in:
vanhofen
2017-12-30 22:53:09 +01:00
parent 97031be09b
commit d4af3caaef
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/movieplayer.cpp
View File

@@ -1995,12 +1995,15 @@ void CMoviePlayerGui::PlayFileLoop(void)
showHelp(); showHelp();
enableOsdElements(NO_MUTE); enableOsdElements(NO_MUTE);
} else if (msg == CRCInput::RC_info) { } else if (msg == CRCInput::RC_info) {
if (fromInfoviewer) { if (fromInfoviewer)
{
disableOsdElements(NO_MUTE); disableOsdElements(NO_MUTE);
#ifdef ENABLE_LUA #ifdef ENABLE_LUA
if (isLuaPlay && haveLuaInfoFunc) { if (isLuaPlay && haveLuaInfoFunc)
{
int xres = 0, yres = 0, aspectRatio = 0, framerate = -1; int xres = 0, yres = 0, aspectRatio = 0, framerate = -1;
if (!videoDecoder->getBlank()) { if (!videoDecoder->getBlank())
{
videoDecoder->getPictureInfo(xres, yres, framerate); videoDecoder->getPictureInfo(xres, yres, framerate);
if (yres == 1088) if (yres == 1088)
yres = 1080; yres = 1080;
@@ -2008,12 +2011,10 @@ void CMoviePlayerGui::PlayFileLoop(void)
} }
CLuaInstVideo::getInstance()->execLuaInfoFunc(luaState, xres, yres, aspectRatio, framerate); CLuaInstVideo::getInstance()->execLuaInfoFunc(luaState, xres, yres, aspectRatio, framerate);
} }
else { else
#endif #endif
g_EpgData->show_mp(p_movie_info,GetPosition(),GetDuration()); g_EpgData->show_mp(p_movie_info,GetPosition(),GetDuration());
#ifdef ENABLE_LUA
}
#endif
fromInfoviewer = false; fromInfoviewer = false;
enableOsdElements(NO_MUTE); enableOsdElements(NO_MUTE);
} }