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

movieplayer: move code to display movie-info to an own public function

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69458b5610
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-22 (Sun, 22 Jul 2018)

Origin message was:
------------------
- movieplayer: move code to display movie-info to an own public function

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-22 23:27:23 +02:00
parent 2c912b4b54
commit c1216df34f
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gui/movieplayer.cpp
View File

@@ -1891,28 +1891,8 @@ void CMoviePlayerGui::PlayFileLoop(void)
} else if (msg == CRCInput::RC_info) { } else if (msg == CRCInput::RC_info) {
if (fromInfoviewer) if (fromInfoviewer)
{ {
disableOsdElements(NO_MUTE); showMovieInfo();
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());
fromInfoviewer = false; fromInfoviewer = false;
enableOsdElements(NO_MUTE);
} }
else else
callInfoViewer(); callInfoViewer();
@@ -2053,6 +2033,32 @@ void CMoviePlayerGui::set_vzap_it(bool up)
//printf("CMoviePlayerGui::%s: vzap_it: %d\n", __func__, (int)(vzap_it - filelist.begin())); //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) void CMoviePlayerGui::callInfoViewer(bool init_vzap_it)
{ {
if (init_vzap_it) if (init_vzap_it)

1
src/gui/movieplayer.h
View File

@@ -272,6 +272,7 @@ class CMoviePlayerGui : public CMenuTarget
void getLivestreamInfo(std::string *i1, std::string *i2) { *i1=livestreamInfo1; *i2=livestreamInfo2; }; 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 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; }; bool IsAudioPlaying() { return is_audio_playing; };
void showMovieInfo();
}; };
#endif #endif