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

src/gui/epgview.cpp: rework online epg database handling

Browse Source 
Vizualize of TMDb starbar was partial broken, should working now and IMDb (in reality OMDb)
should working too. DEV/Api keys are required and are managed with
misc settings menue. To get reqiured keys see https://www.omdbapi.com/ and
for TMDb see https://www.themoviedb.org

TODO: Better encapsulating for db classes for unified data tapping.
This commit is contained in:
Thilo Graf
2018-04-27 15:57:27 +02:00
parent 6adaf26f48
commit d84c2f74a1
1 changed files with 17 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/gui/epgview.cpp
View File

@@ -35,7 +35,7 @@
#include <gui/widget/icons.h> #include <gui/widget/icons.h>
#include <gui/widget/msgbox.h> #include <gui/widget/msgbox.h>
#include <gui/widget/mountchooser.h> #include <gui/widget/mountchooser.h>
#include <gui/components/cc.h>
#include <gui/timerlist.h> #include <gui/timerlist.h>
#include <zapit/zapit.h> #include <zapit/zapit.h>
#include <system/helpers.h> #include <system/helpers.h>
@@ -287,54 +287,29 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
frameBuffer->paintBoxRel(sx, y, ox-SCROLLBAR_WIDTH, sb, COL_MENUCONTENT_PLUS_0); // background of the text box frameBuffer->paintBoxRel(sx, y, ox-SCROLLBAR_WIDTH, sb, COL_MENUCONTENT_PLUS_0); // background of the text box
} }
} }
int logo_offset = 0;
int icon_w = 0;
int icon_h = 0;
if (tmdb_active && startPos == 0)
{
frameBuffer->getIconSize(NEUTRINO_ICON_TMDB, &icon_w, &icon_h);
frameBuffer->paintIcon(NEUTRINO_ICON_TMDB, sx+OFFSET_INNER_MID+cover_offset, y+(medlineheight-icon_h)/2);
logo_offset = icon_w + OFFSET_INNER_MID;
}
if (imdb_active && startPos == 0) // show ranking
{
frameBuffer->getIconSize(NEUTRINO_ICON_IMDB, &icon_w, &icon_h);
frameBuffer->paintIcon(NEUTRINO_ICON_IMDB, sx+OFFSET_INNER_MID+cover_offset, y+(medlineheight-icon_h)/2);
logo_offset = icon_w + OFFSET_INNER_MID;
}
if (stars > 0 && startPos == 0)
{
frameBuffer->getIconSize(NEUTRINO_ICON_STAR_OFF, &icon_w, &icon_h);
for (int i = 0; i < 10; i++)
frameBuffer->paintIcon(NEUTRINO_ICON_STAR_OFF, sx+10+cover_offset+logo_offset + i*(icon_w+3), y+(medlineheight-icon_h)/2);
for (int i = 0; i < stars; i++)
frameBuffer->paintIcon(NEUTRINO_ICON_STAR_ON, sx+10+cover_offset+logo_offset + i*(icon_w+3), y+(medlineheight-icon_h)/2);
}
#if 0
if ((stars > 0 || imdb_stars > 0) && (tmdb_active || imdb_active) && startPos == 0) if ((stars > 0 || imdb_stars > 0) && (tmdb_active || imdb_active) && startPos == 0)
{ {
if (stars <= 10) std::string provider_logo = "";
stars *= 10; // recalculate stars value for starbar
int stars_w = 0, stars_h = 0; if (tmdb_active && startPos == 0)
frameBuffer->getIconSize(NEUTRINO_ICON_STARS_BG, &stars_w, &stars_h); provider_logo = NEUTRINO_ICON_TMDB;
if (imdb_active && startPos == 0)
provider_logo = NEUTRINO_ICON_IMDB;
//create starbar item int max_stars = 10;
CProgressBar *cc_starbar = new CProgressBar(); if (imdb_active && imdb_stars) //TODO: unify imdb and tmdb
cc_starbar->setProgress(sx+OFFSET_INNER_MID+cover_offset+logo_offset, y+(medlineheight-stars_h)/2, stars_w, medlineheight, imdb_active ? imdb_stars : stars, 100); stars = imdb_stars / max_stars; // recalculate stars value for starbar
cc_starbar->setType(CProgressBar::PB_STARBAR);
cc_starbar->paint();
if (imdb_active) //create and paint ranking banner
{ CEPGRateBanner rate_bar(sx+10+cover_offset, y+OFFSET_INNER_MID, (size_t)stars, (size_t)max_stars, provider_logo);
int _x = sx+OFFSET_INNER_MID+cover_offset+logo_offset+cc_starbar->getWidth()+OFFSET_INNER_MID; rate_bar.paint();
int _w = ox-OFFSET_INNER_MID-cover_offset-logo_offset-cc_starbar->getWidth()-OFFSET_INNER_MID;
g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO1]->RenderString(_x, y+medlineheight, _w, imdb_rating, COL_MENUCONTENT_TEXT, 0, true); if (imdb_active) //TODO: unify imdb and tmdb
} paintTextBoxRel(imdb_rating, sx + 2*OFFSET_INNER_MID + cover_offset + rate_bar.getWidth(), y + OFFSET_INNER_MID, rate_bar.getHeight());
} }
#endif
for (int i = startPos; i < textSize && i < startPos + medlinecount; i++, y += medlineheight) for (int i = startPos; i < textSize && i < startPos + medlinecount; i++, y += medlineheight)
{ {
if(epgText[i].second){ if(epgText[i].second){