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

epgview: more imdb/tmdb unifications

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a2355cd6b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-04-10 (Sat, 10 Apr 2021)

Origin message was:
------------------
- epgview: more imdb/tmdb unifications

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2021-04-10 22:19:43 +02:00
parent 2c99ed0a24
commit 6f0e3849db
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/epgview.cpp
View File

@@ -244,7 +244,7 @@ void CEpgData::processTextToArray(std::string text, int screening, bool has_cove
void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
{ {
Font* font = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]; Font* font = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2];
std::string cover = tmdb->getCover(); std::string cover = "";
int cover_max_width = ox/4; //25% int cover_max_width = ox/4; //25%
int cover_max_height = sb-(2*OFFSET_INNER_MID); int cover_max_height = sb-(2*OFFSET_INNER_MID);
int cover_width = 0; int cover_width = 0;
@@ -255,6 +255,8 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
{ {
if (imdb_active) if (imdb_active)
cover = imdb->posterfile; cover = imdb->posterfile;
else if (tmdb_active)
cover = tmdb->getCover();
g_PicViewer->getSize(cover.c_str(), &cover_width, &cover_height); g_PicViewer->getSize(cover.c_str(), &cover_width, &cover_height);
if (cover_width && cover_height) if (cover_width && cover_height)
@@ -727,6 +729,8 @@ 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;
imdb_active = false;
imdb_stars = 0;
tmdb_active = false; tmdb_active = false;
tmdb_stars = 0; tmdb_stars = 0;
@@ -1014,9 +1018,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
CNeutrinoApp::getInstance()->handleMsg(msg, data); CNeutrinoApp::getInstance()->handleMsg(msg, data);
break; break;
case CRCInput::RC_left: case CRCInput::RC_left:
if(imdb_active)
imdb_active = false;
if ((prev_id != 0) && !call_fromfollowlist && !mp_info) if ((prev_id != 0) && !call_fromfollowlist && !mp_info)
{ {
toph = topboxheight; toph = topboxheight;
@@ -1025,9 +1026,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
} }
break; break;
case CRCInput::RC_right: case CRCInput::RC_right:
if(imdb_active)
imdb_active = false;
if ((next_id != 0) && !call_fromfollowlist && !mp_info) if ((next_id != 0) && !call_fromfollowlist && !mp_info)
{ {
toph = topboxheight; toph = topboxheight;
@@ -1199,19 +1197,19 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
if ((tmdb->getResults() > 0) && (!tmdb->getDescription().empty())) { if ((tmdb->getResults() > 0) && (!tmdb->getDescription().empty())) {
epgText_saved = epgText; epgText_saved = epgText;
epgText.clear(); epgText.clear();
tmdb_active = !tmdb_active; tmdb_active = true;
epgTextSwitch = tmdb->CreateMovieText(); epgTextSwitch = tmdb->CreateMovieText();
processTextToArray(tmdb->CreateEPGText(), 0, tmdb->hasCover()); processTextToArray(tmdb->CreateEPGText(), 0, tmdb->hasCover());
textCount = epgText.size(); textCount = epgText.size();
tmdb_stars = tmdb->getStars(); tmdb_stars = tmdb->getStars();
showText(showPos, sy + toph, tmdb_active || (imdb_active && imdb->gotPoster())); showText(showPos, sy + toph, tmdb_active);
} else { } else {
ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NODETAILED, CMsgBox::mbrOk , CMsgBox::mbrOk); ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NODETAILED, CMsgBox::mbrOk , CMsgBox::mbrOk);
} }
} else { } else {
epgText = epgText_saved; epgText = epgText_saved;
textCount = epgText.size(); textCount = epgText.size();
tmdb_active = !tmdb_active; tmdb_active = false;
tmdb_stars=0; tmdb_stars=0;
showText(showPos, sy + toph); showText(showPos, sy + toph);
} }