mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +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 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7dbda6c25e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-10 13:02:18 +02:00
parent e00130c05b 199be90d4d
commit 60b9430ebc
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/epgview.cpp
View File

@@ -126,6 +126,7 @@ CEpgData::CEpgData()
bigFonts = false;
frameBuffer = CFrameBuffer::getInstance();
tmdb_active = false;
mp_movie_info = NULL;
header = NULL;
//NI
imdb = CIMDB::getInstance();
@@ -546,9 +547,11 @@ bool CEpgData::isCurrentEPG(const t_channel_id channel_id)
return false;
}
int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int /*mp_position*/, int /*mp_duration*/, bool doLoop)
int CEpgData::show_mp(MI_MOVIE_INFO *mi, int /*mp_position*/, int /*mp_duration*/, bool doLoop)
{
int res = menu_return::RETURN_REPAINT;
mp_movie_info = mi;
if (mp_movie_info == NULL)
return res;
@@ -688,7 +691,7 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int /*mp_position*/, int /*m
extMovieInfo += mp_movie_info->file.getFileName();
extMovieInfo += "\n";
res = show(mp_movie_info->epgEpgId >>16, 0, 0, doLoop, false,true );
res = show(mp_movie_info->epgEpgId >> 16, 0, 0, doLoop, false, true);
if(!epgTextSwitch.empty())
mp_movie_info->epgInfo2 = epgTextSwitch;
return res;
@@ -1333,7 +1336,10 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() / BIG_FONT_FAKTOR));
}
g_settings.bigFonts = bigFonts;
show(channel_id, id, &startzeit, false, call_fromfollowlist);
if (mp_info)
show(mp_movie_info->epgEpgId >> 16, 0, 0, false, false, true);
else
show(channel_id, id, &startzeit, false, call_fromfollowlist);
showPos=0;
break;
case CRCInput::RC_info: //NI