mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- epgview: rename bool 'cover' to 'has_cover'

Browse Source
This commit is contained in:
svenhoefer
2016-08-02 10:28:49 +02:00
parent 148ba9428a
commit a4ffdcd413
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/epgview.cpp
View File

@@ -229,7 +229,7 @@ void CEpgData::processTextToArray(std::string text, int screening, bool has_cove
addTextToArray( aktLine + aktWord, screening ); addTextToArray( aktLine + aktWord, screening );
} }
void CEpgData::showText(int startPos, int ypos, bool cover, bool fullClear) void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
{ {
// recalculate // recalculate
medlineheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getHeight(); medlineheight = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->getHeight();
@@ -237,7 +237,7 @@ void CEpgData::showText(int startPos, int ypos, bool cover, bool fullClear)
int cover_height = std::min(sb-10,513); int cover_height = std::min(sb-10,513);
int cover_width = std::min((sb-10)*342/513,342); int cover_width = std::min((sb-10)*342/513,342);
int cover_offset = cover ? cover_width+3 : 0; int cover_offset = has_cover ? cover_width+3 : 0;
int textSize = epgText.size(); int textSize = epgText.size();
int y=ypos; int y=ypos;
const char tok = ' '; const char tok = ' ';
@@ -253,7 +253,7 @@ void CEpgData::showText(int startPos, int ypos, bool cover, bool fullClear)
int offs = fullClear ? 0 : cover_offset; int offs = fullClear ? 0 : cover_offset;
frameBuffer->paintBoxRel(sx+offs, y, ox-15-offs, sb, COL_MENUCONTENT_PLUS_0); // background of the text box frameBuffer->paintBoxRel(sx+offs, y, ox-15-offs, sb, COL_MENUCONTENT_PLUS_0); // background of the text box
if (cover) { if (has_cover) {
if (!g_PicViewer->DisplayImage("/tmp/tmdb.jpg",sx+3,y+3+((sb-cover_height)/2),cover_width,cover_height, CFrameBuffer::TM_NONE)) { if (!g_PicViewer->DisplayImage("/tmp/tmdb.jpg",sx+3,y+3+((sb-cover_height)/2),cover_width,cover_height, CFrameBuffer::TM_NONE)) {
cover_offset = 0; cover_offset = 0;
frameBuffer->paintBoxRel(sx, y, ox-15, sb, COL_MENUCONTENT_PLUS_0); // background of the text box frameBuffer->paintBoxRel(sx, y, ox-15, sb, COL_MENUCONTENT_PLUS_0); // background of the text box

2
src/gui/epgview.h
View File

@@ -89,7 +89,7 @@ class CEpgData
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 );
void processTextToArray(std::string text, int screening = 0, bool has_cover = false); void processTextToArray(std::string text, int screening = 0, bool has_cover = false);
void showText( int startPos, int ypos, bool cover=false, bool fullClear=true ); void showText(int startPos, int ypos, bool has_cover = false, bool fullClear = true);
bool hasFollowScreenings(const t_channel_id channel_id, const std::string & title); bool hasFollowScreenings(const t_channel_id channel_id, const std::string & title);
int FollowScreenings(const t_channel_id channel_id, const std::string & title); int FollowScreenings(const t_channel_id channel_id, const std::string & title);
void showTimerEventBar(bool show, bool adzap = false, bool mp_info = false); void showTimerEventBar(bool show, bool adzap = false, bool mp_info = false);