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

- epgview: rename bool 'tmdbtoggle' to 'tmdb_active'

Browse Source
This commit is contained in:
svenhoefer
2016-08-02 12:48:18 +02:00
parent 6e3ef2375b
commit 7df061947e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/epgview.cpp
View File

@@ -122,7 +122,7 @@ CEpgData::CEpgData()
{ {
bigFonts = false; bigFonts = false;
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
tmdbtoggle = false; tmdb_active = false;
header = NULL; header = NULL;
} }
@@ -274,7 +274,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
} }
} }
int logo_offset = 0; int logo_offset = 0;
if (tmdbtoggle && startPos == 0) { if (tmdb_active && startPos == 0) {
int icon_w,icon_h; int icon_w,icon_h;
frameBuffer->getIconSize(NEUTRINO_ICON_TMDB, &icon_w, &icon_h); frameBuffer->getIconSize(NEUTRINO_ICON_TMDB, &icon_w, &icon_h);
frameBuffer->paintIcon(NEUTRINO_ICON_TMDB, sx+10+cover_offset, ypos+10); frameBuffer->paintIcon(NEUTRINO_ICON_TMDB, sx+10+cover_offset, ypos+10);
@@ -544,7 +544,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
startzeit=*a_startzeit; startzeit=*a_startzeit;
id=a_id; id=a_id;
tmdbtoggle = false; tmdb_active = false;
stars = 0; stars = 0;
int height = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight(); int height = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_DATE]->getHeight();
@@ -868,7 +868,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if (showPos+scrollCount<textCount) if (showPos+scrollCount<textCount)
{ {
showPos += scrollCount; showPos += scrollCount;
showText(showPos, sy + toph, tmdbtoggle, false); showText(showPos, sy + toph, tmdb_active, false);
} }
break; break;
case CRCInput::RC_up: case CRCInput::RC_up:
@@ -876,7 +876,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
showPos -= scrollCount; showPos -= scrollCount;
if (showPos < 0) if (showPos < 0)
showPos = 0; showPos = 0;
showText(showPos, sy + toph, tmdbtoggle, false); showText(showPos, sy + toph, tmdb_active, false);
} }
break; break;
case CRCInput::RC_page_up: case CRCInput::RC_page_up:
@@ -1016,12 +1016,12 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") if (g_settings.tmdb_api_key != "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
{ {
showPos = 0; showPos = 0;
if (!tmdbtoggle) { if (!tmdb_active) {
cTmdb* tmdb = new cTmdb(epgData.title); cTmdb* tmdb = new cTmdb(epgData.title);
if ((tmdb->getResults() > 0) && (!tmdb->getDescription().empty())) { if ((tmdb->getResults() > 0) && (!tmdb->getDescription().empty())) {
epgText_saved = epgText; epgText_saved = epgText;
epgText.clear(); epgText.clear();
tmdbtoggle = !tmdbtoggle; tmdb_active = !tmdb_active;
epgTextSwitch = tmdb->getDescription(); epgTextSwitch = tmdb->getDescription();
if (!tmdb->getCast().empty()) if (!tmdb->getCast().empty())
@@ -1030,7 +1030,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
processTextToArray(tmdb->CreateEPGText(), 0, tmdb->hasCover()); processTextToArray(tmdb->CreateEPGText(), 0, tmdb->hasCover());
textCount = epgText.size(); textCount = epgText.size();
stars = tmdb->getStars(); stars = tmdb->getStars();
showText(showPos, sy + toph, tmdbtoggle); showText(showPos, sy + toph, tmdb_active);
} else { } else {
ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NODETAILED, CMessageBox::mbrOk , CMessageBox::mbrOk); ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NODETAILED, CMessageBox::mbrOk , CMessageBox::mbrOk);
} }
@@ -1038,7 +1038,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
} else { } else {
epgText = epgText_saved; epgText = epgText_saved;
textCount = epgText.size(); textCount = epgText.size();
tmdbtoggle = !tmdbtoggle; tmdb_active = !tmdb_active;
stars=0; stars=0;
showText(showPos, sy + toph); showText(showPos, sy + toph);
} }

4
src/gui/epgview.h
View File

@@ -65,8 +65,8 @@ class CEpgData
bool bigFonts; bool bigFonts;
bool has_follow_screenings; bool has_follow_screenings;
bool call_fromfollowlist; bool call_fromfollowlist;
bool tmdbtoggle; bool tmdb_active;
int stars; int stars;
time_t tmp_curent_zeit; time_t tmp_curent_zeit;
uint64_t prev_id; uint64_t prev_id;