diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 7a8ae6eef..493eba0b3 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1878,29 +1878,10 @@ void CMoviePlayerGui::PlayFileLoop(void) showHelp(); enableOsdElements(NO_MUTE); } else if (msg == CRCInput::RC_info) { - if (fromInfoviewer) { - disableOsdElements(NO_MUTE); - if (g_settings.movieplayer_display_playtime) - updateLcd(false); // force title -#ifdef ENABLE_LUA - if (isLuaPlay && haveLuaInfoFunc) { - int xres = 0, yres = 0, aspectRatio = 0, framerate = -1; - if (!videoDecoder->getBlank()) { - videoDecoder->getPictureInfo(xres, yres, framerate); - if (yres == 1088) - yres = 1080; - aspectRatio = videoDecoder->getAspectRatio(); - } - CLuaInstVideo::getInstance()->execLuaInfoFunc(luaState, xres, yres, aspectRatio, framerate); - } - else { -#endif - g_EpgData->show_mp(p_movie_info,GetPosition(),GetDuration()); -#ifdef ENABLE_LUA - } -#endif + if (fromInfoviewer) + { + showMovieInfo(); fromInfoviewer = false; - enableOsdElements(NO_MUTE); } else callInfoViewer(); @@ -2052,6 +2033,32 @@ void CMoviePlayerGui::set_vzap_it(bool up) //printf("CMoviePlayerGui::%s: vzap_it: %d\n", __func__, (int)(vzap_it - filelist.begin())); } +void CMoviePlayerGui::showMovieInfo() +{ + disableOsdElements(NO_MUTE); + if (g_settings.movieplayer_display_playtime) + updateLcd(false); // force title + +#ifdef ENABLE_LUA + if (isLuaPlay && haveLuaInfoFunc) + { + int xres = 0, yres = 0, aspectRatio = 0, framerate = -1; + if (!videoDecoder->getBlank()) + { + videoDecoder->getPictureInfo(xres, yres, framerate); + if (yres == 1088) + yres = 1080; + aspectRatio = videoDecoder->getAspectRatio(); + } + CLuaInstVideo::getInstance()->execLuaInfoFunc(luaState, xres, yres, aspectRatio, framerate); + } + else +#endif + g_EpgData->show_mp(p_movie_info,GetPosition(),GetDuration()); + + enableOsdElements(NO_MUTE); +} + void CMoviePlayerGui::callInfoViewer(bool init_vzap_it) { if (init_vzap_it) diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h index 40e12550b..11a1ce813 100644 --- a/src/gui/movieplayer.h +++ b/src/gui/movieplayer.h @@ -271,6 +271,7 @@ class CMoviePlayerGui : public CMenuTarget void getLivestreamInfo(std::string *i1, std::string *i2) { *i1=livestreamInfo1; *i2=livestreamInfo2; }; bool getLiveUrl(const std::string &url, const std::string &script, std::string &realUrl, std::string &_pretty_name, std::string &info1, std::string &info2, std::string &header); bool IsAudioPlaying() { return is_audio_playing; }; + void showMovieInfo(); }; #endif