mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 00:11:08 +02:00
Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 230b3dfe5e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-05-29 (Mon, 29 May 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -321,7 +321,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
|
|||||||
stars *= 10; // recalculate stars value for starbar
|
stars *= 10; // recalculate stars value for starbar
|
||||||
|
|
||||||
int stars_w = 0, stars_h = 0;
|
int stars_w = 0, stars_h = 0;
|
||||||
g_PicViewer->getSize(imdb->stars_bg.c_str(), &stars_w, &stars_h);
|
g_PicViewer->getSize(NEUTRINO_ICON_STARS_BG, &stars_w, &stars_h);
|
||||||
|
|
||||||
//create starbar item
|
//create starbar item
|
||||||
CProgressBar *cc_starbar = new CProgressBar();
|
CProgressBar *cc_starbar = new CProgressBar();
|
||||||
|
@@ -48,8 +48,6 @@ CIMDB::CIMDB()
|
|||||||
IMDbAPI = "/tmp/imdb.json";
|
IMDbAPI = "/tmp/imdb.json";
|
||||||
omdbapiKey = "&apikey=20711f9e";
|
omdbapiKey = "&apikey=20711f9e";
|
||||||
posterfile = "/tmp/imdb.jpg";
|
posterfile = "/tmp/imdb.jpg";
|
||||||
stars_bg = ICONSDIR "/stars_bg.png";
|
|
||||||
stars = ICONSDIR "/stars.png";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CIMDB::~CIMDB()
|
CIMDB::~CIMDB()
|
||||||
|
@@ -41,8 +41,6 @@ class CIMDB
|
|||||||
std::string soutfile;
|
std::string soutfile;
|
||||||
std::string IMDbAPI;
|
std::string IMDbAPI;
|
||||||
std::string posterfile;
|
std::string posterfile;
|
||||||
std::string stars_bg;
|
|
||||||
std::string stars;
|
|
||||||
|
|
||||||
int getIMDb(const std::string& epgTitle);
|
int getIMDb(const std::string& epgTitle);
|
||||||
std::string getFilename(CZapitChannel * channel, uint64_t id);
|
std::string getFilename(CZapitChannel * channel, uint64_t id);
|
||||||
|
@@ -183,6 +183,8 @@
|
|||||||
#define NEUTRINO_ICON_PIP "pip"
|
#define NEUTRINO_ICON_PIP "pip"
|
||||||
#define NEUTRINO_ICON_STAR_ON "star-on"
|
#define NEUTRINO_ICON_STAR_ON "star-on"
|
||||||
#define NEUTRINO_ICON_STAR_OFF "star-off"
|
#define NEUTRINO_ICON_STAR_OFF "star-off"
|
||||||
|
#define NEUTRINO_ICON_STARS_BG "stars_bg.png" //NI
|
||||||
|
#define NEUTRINO_ICON_STARS "stars.png" //NI
|
||||||
#define NEUTRINO_ICON_TMDB "tmdb"
|
#define NEUTRINO_ICON_TMDB "tmdb"
|
||||||
#define NEUTRINO_ICON_IMDB "imdb"
|
#define NEUTRINO_ICON_IMDB "imdb"
|
||||||
#define NEUTRINO_ICON_PICTUREVIEWER "pictureviewer"
|
#define NEUTRINO_ICON_PICTUREVIEWER "pictureviewer"
|
||||||
|
Reference in New Issue
Block a user