From d4af3caaef0d4e540d80b34d3ecfbe4f3c38b9f7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 30 Dec 2017 22:53:09 +0100 Subject: [PATCH] movieplayer: remove unneeded ifdef ENABLE_LUA Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/4c65ebbd73a9a9f03031780c91730d07be2b6f1e Author: vanhofen Date: 2017-12-30 (Sat, 30 Dec 2017) Origin message was: ------------------ - movieplayer: remove unneeded ifdef ENABLE_LUA --- src/gui/movieplayer.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 688056164..469a7bbb6 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1995,12 +1995,15 @@ void CMoviePlayerGui::PlayFileLoop(void) showHelp(); enableOsdElements(NO_MUTE); } else if (msg == CRCInput::RC_info) { - if (fromInfoviewer) { + if (fromInfoviewer) + { disableOsdElements(NO_MUTE); #ifdef ENABLE_LUA - if (isLuaPlay && haveLuaInfoFunc) { + if (isLuaPlay && haveLuaInfoFunc) + { int xres = 0, yres = 0, aspectRatio = 0, framerate = -1; - if (!videoDecoder->getBlank()) { + if (!videoDecoder->getBlank()) + { videoDecoder->getPictureInfo(xres, yres, framerate); if (yres == 1088) yres = 1080; @@ -2008,12 +2011,10 @@ void CMoviePlayerGui::PlayFileLoop(void) } CLuaInstVideo::getInstance()->execLuaInfoFunc(luaState, xres, yres, aspectRatio, framerate); } - else { + else #endif g_EpgData->show_mp(p_movie_info,GetPosition(),GetDuration()); -#ifdef ENABLE_LUA - } -#endif + fromInfoviewer = false; enableOsdElements(NO_MUTE); }