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

epgview: fix bigfonts switch in movieplayer mode

Browse Source 
Origin commit data
------------------
Commit: a6875eb3f3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- epgview: fix bigfonts switch in movieplayer mode
This commit is contained in:
vanhofen
2016-08-10 12:58:43 +02:00
parent 3202d27319
commit 7a90c723d8
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/epgview.cpp
View File

@@ -123,6 +123,7 @@ CEpgData::CEpgData()
bigFonts = false; bigFonts = false;
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
tmdb_active = false; tmdb_active = false;
mp_movie_info = NULL;
header = NULL; header = NULL;
} }
@@ -503,9 +504,11 @@ bool CEpgData::isCurrentEPG(const t_channel_id channel_id)
return false; 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; int res = menu_return::RETURN_REPAINT;
mp_movie_info = mi;
if (mp_movie_info == NULL) if (mp_movie_info == NULL)
return res; return res;
@@ -644,7 +647,7 @@ int CEpgData::show_mp(MI_MOVIE_INFO *mp_movie_info, int /*mp_position*/, int /*m
extMovieInfo += mp_movie_info->file.getFileName(); extMovieInfo += mp_movie_info->file.getFileName();
extMovieInfo += "\n"; 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()) if(!epgTextSwitch.empty())
mp_movie_info->epgInfo2 = epgTextSwitch; mp_movie_info->epgInfo2 = epgTextSwitch;
return res; return res;
@@ -1217,6 +1220,9 @@ 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_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->setSize((int)(g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]->getSize() / BIG_FONT_FAKTOR));
} }
g_settings.bigFonts = bigFonts; g_settings.bigFonts = bigFonts;
if (mp_info)
show(mp_movie_info->epgEpgId >> 16, 0, 0, false, false, true);
else
show(channel_id, id, &startzeit, false, call_fromfollowlist); show(channel_id, id, &startzeit, false, call_fromfollowlist);
showPos=0; showPos=0;
break; break;

4
src/gui/epgview.h
View File

@@ -86,6 +86,8 @@ class CEpgData
int buttonheight,botboxheight; int buttonheight,botboxheight;
int medlineheight,medlinecount; int medlineheight,medlinecount;
MI_MOVIE_INFO *mp_movie_info;
void GetEPGData(const t_channel_id channel_id, uint64_t id, time_t* startzeit, bool clear = true ); void GetEPGData(const t_channel_id channel_id, uint64_t id, time_t* startzeit, bool clear = true );
void GetPrevNextEPGData( uint64_t id, time_t* startzeit ); void GetPrevNextEPGData( uint64_t id, time_t* startzeit );
void addTextToArray( const std::string & text, int screening ); void addTextToArray( const std::string & text, int screening );
@@ -103,7 +105,7 @@ class CEpgData
~CEpgData(); ~CEpgData();
void start( ); void start( );
int show(const t_channel_id channel_id, uint64_t id = 0, time_t* startzeit = NULL, bool doLoop = true, bool callFromfollowlist = false, bool mp_info = false ); int show(const t_channel_id channel_id, uint64_t id = 0, time_t* startzeit = NULL, bool doLoop = true, bool callFromfollowlist = false, bool mp_info = false );
int show_mp(MI_MOVIE_INFO *mp_movie_info, int mp_position = 1, int mp_duration = 1, bool doLoop = true); int show_mp(MI_MOVIE_INFO *mi, int mp_position = 1, int mp_duration = 1, bool doLoop = true);
void hide(); void hide();
}; };