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

- epgview: more imdb/tmdb unifications

Browse Source 
Conflicts:
	src/gui/epgview.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-04-08 17:31:07 +02:00
committed by Thilo Graf
parent b81f316217
commit f6299d4f81
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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)
@@ -700,6 +702,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;
stars = 0; stars = 0;
@@ -985,9 +989,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;
@@ -996,9 +997,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;
@@ -1182,7 +1180,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();
tmdb_active = !tmdb_active; tmdb_active = false;
stars=0; stars=0;
showText(showPos, sy + toph); showText(showPos, sy + toph);
} }