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

epgview/imdb: rename bool 'imdb_activ' to 'imdb_active'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9e78fac28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- epgview/imdb: rename bool 'imdb_activ' to 'imdb_active'

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-02 13:05:06 +02:00
parent 57d01e1fbe
commit 46851fe4e0
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gui/epgview.cpp
View File

@@ -129,7 +129,7 @@ CEpgData::CEpgData()
header = NULL; header = NULL;
//NI //NI
imdb = CIMDB::getInstance(); imdb = CIMDB::getInstance();
imdb_activ = false; imdb_active = false;
poster_w = 0; poster_w = 0;
poster_h = 0; poster_h = 0;
} }
@@ -192,7 +192,7 @@ void CEpgData::processTextToArray(std::string text, int screening, bool has_cove
//NI IMDb //NI IMDb
int poster_offset = 0; int poster_offset = 0;
if (imdb_activ && (poster_w != 0)) if (imdb_active && (poster_w != 0))
poster_offset += poster_w + 10; poster_offset += poster_w + 10;
while (*text_!=0) while (*text_!=0)
@@ -274,7 +274,7 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear)
//NI IMDb //NI IMDb
int poster_offset = cover_offset; int poster_offset = cover_offset;
if (imdb_activ && (poster_w != 0)) if (imdb_active && (poster_w != 0))
poster_offset += poster_w + 10; poster_offset += poster_w + 10;
for(int i = 0; i < 12;i++){ for(int i = 0; i < 12;i++){
@@ -869,8 +869,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
break; break;
case CRCInput::RC_left: case CRCInput::RC_left:
//NI //NI
if(imdb_activ) if(imdb_active)
imdb_activ = false; imdb_active = false;
if ((prev_id != 0) && !call_fromfollowlist) if ((prev_id != 0) && !call_fromfollowlist)
{ {
@@ -883,8 +883,8 @@ 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:
//NI //NI
if(imdb_activ) if(imdb_active)
imdb_activ = false; imdb_active = false;
if ((next_id != 0) && !call_fromfollowlist) if ((next_id != 0) && !call_fromfollowlist)
{ {
@@ -897,7 +897,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
break; break;
case CRCInput::RC_down: case CRCInput::RC_down:
//NI //NI
if(imdb_activ) if(imdb_active)
break; break;
if (showPos+scrollCount<textCount) if (showPos+scrollCount<textCount)
@@ -908,7 +908,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
break; break;
case CRCInput::RC_up: case CRCInput::RC_up:
//NI //NI
if(imdb_activ) if(imdb_active)
break; break;
if (showPos > 0) { if (showPos > 0) {
@@ -1053,8 +1053,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
#if 0 #if 0
case CRCInput::RC_info: case CRCInput::RC_info:
{ {
if (imdb_activ) { if (imdb_active) {
imdb_activ = false; imdb_active = false;
showTimerEventBar (true); //show buttons showTimerEventBar (true); //show buttons
epgText = epgText_saved; epgText = epgText_saved;
textCount = epgText.size(); textCount = epgText.size();
@@ -1102,7 +1102,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
stars=0; stars=0;
} }
#endif #endif
if(!imdb_activ) if(!imdb_active)
{ {
//show IMDb info //show IMDb info
showIMDb(sy + toph, true); //show splashscreen only showIMDb(sy + toph, true); //show splashscreen only
@@ -1113,7 +1113,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
} }
else else
{ {
imdb_activ = false; imdb_active = false;
std::string filename = imdb->getFilename(channel, epgData.eventID); std::string filename = imdb->getFilename(channel, epgData.eventID);
if (File_copy(imdb->posterfile.c_str(), filename.c_str())) if (File_copy(imdb->posterfile.c_str(), filename.c_str()))
@@ -1160,8 +1160,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
case CRCInput::RC_blue: case CRCInput::RC_blue:
{ {
//NI //NI
if(imdb_activ) if(imdb_active)
imdb_activ = false; imdb_active = false;
if(!followlist.empty() && !call_fromfollowlist){ if(!followlist.empty() && !call_fromfollowlist){
hide(); hide();
@@ -1267,7 +1267,7 @@ void CEpgData::hide()
showTimerEventBar (false); showTimerEventBar (false);
//NI //NI
imdb_activ = false; imdb_active = false;
imdb->cleanup(); imdb->cleanup();
} }
@@ -1447,7 +1447,7 @@ void CEpgData::showTimerEventBar (bool pshow, bool adzap, bool mp_info)
frameBuffer->paintBoxRel(sx,y,ox,h, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_LARGE, CORNER_BOTTOM);//round frameBuffer->paintBoxRel(sx,y,ox,h, COL_INFOBAR_SHADOW_PLUS_1, RADIUS_LARGE, CORNER_BOTTOM);//round
/* 2 * ICON_LARGE_WIDTH for potential 16:9 and DD icons */ /* 2 * ICON_LARGE_WIDTH for potential 16:9 and DD icons */
int aw = ox - 20 - 2 * (ICON_LARGE_WIDTH + 2); int aw = ox - 20 - 2 * (ICON_LARGE_WIDTH + 2);
EpgButtons[1].locale = imdb_activ ? LOCALE_IMDB_INFO_SAVE : LOCALE_IMDB_INFO; //NI EpgButtons[1].locale = imdb_active ? LOCALE_IMDB_INFO_SAVE : LOCALE_IMDB_INFO; //NI
std::string adzap_button; std::string adzap_button;
if (adzap) if (adzap)
{ {
@@ -1513,7 +1513,7 @@ int CEpgData::showIMDb(int ypos, bool splash)
{ {
int poster_max_w = ox/4; // max 25% int poster_max_w = ox/4; // max 25%
int poster_max_h = ((medlinecount-2)*medlineheight); int poster_max_h = ((medlinecount-2)*medlineheight);
imdb_activ = true; imdb_active = true;
g_PicViewer->rescaleImageDimensions(&poster_w, &poster_h, poster_max_w, poster_max_h); g_PicViewer->rescaleImageDimensions(&poster_w, &poster_h, poster_max_w, poster_max_h);
} }

2
src/gui/epgview.h
View File

@@ -99,7 +99,7 @@ class CEpgData
bool isCurrentEPG(const t_channel_id channel_id); bool isCurrentEPG(const t_channel_id channel_id);
//NI //NI
bool imdb_activ; bool imdb_active;
std::string epg_title; std::string epg_title;
int showIMDb(int ypos, bool splash = false); int showIMDb(int ypos, bool splash = false);
int poster_w, poster_h; int poster_w, poster_h;

10
src/gui/imdb.cpp
View File

@@ -57,7 +57,7 @@ CIMDB::CIMDB()
cc_win = NULL; cc_win = NULL;
cc_txt = NULL; cc_txt = NULL;
imdb_activ = false; imdb_active = false;
//initFrame(); /*not use for epginfo //initFrame(); /*not use for epginfo
} }
@@ -66,7 +66,7 @@ CIMDB::~CIMDB()
{ {
cleanup(); cleanup();
imdb_activ = false; imdb_active = false;
if(cc_win) if(cc_win)
delete cc_win; delete cc_win;
} }
@@ -418,7 +418,7 @@ void CIMDB::cleanup()
unlink(soutfile.c_str()); unlink(soutfile.c_str());
if (access(posterfile.c_str(), F_OK) == 0) if (access(posterfile.c_str(), F_OK) == 0)
unlink(posterfile.c_str()); unlink(posterfile.c_str());
imdb_activ = false; imdb_active = false;
} }
void CIMDB::initFrame() void CIMDB::initFrame()
@@ -522,7 +522,7 @@ void CIMDB::showTextWindow(const std::string title, const std::string txt)
void CIMDB::hideWindow(bool keep_active) void CIMDB::hideWindow(bool keep_active)
{ {
if (!keep_active) if (!keep_active)
imdb_activ = false; imdb_active = false;
cc_win->kill(); cc_win->kill();
@@ -574,7 +574,7 @@ void CIMDB::showIMDbWindow(const std::string title)
int w_starbar = 160; //starbar picture width int w_starbar = 160; //starbar picture width
int h_starbar = fontheight; int h_starbar = fontheight;
std::string pg_value = "0"; std::string pg_value = "0";
imdb_activ = true; imdb_active = true;
//show splash //show splash
cc_win->setWindowCaption("IMDb: Daten werden geladen ..."); cc_win->setWindowCaption("IMDb: Daten werden geladen ...");

4
src/gui/imdb.h
View File

@@ -53,7 +53,7 @@ class CIMDB
void showIMDbWindow(const std::string title); void showIMDbWindow(const std::string title);
void showTextWindow(const std::string title, const std::string txt); void showTextWindow(const std::string title, const std::string txt);
void scroll(bool scrollDown); void scroll(bool scrollDown);
bool isActive() { return imdb_activ; }; bool isActive() { return imdb_active; };
virtual void getIMDbElement(std::string& element) { element = m[element]; }; virtual void getIMDbElement(std::string& element) { element = m[element]; };
@@ -73,7 +73,7 @@ class CIMDB
int h_body, w_body, h_offset, v_offset; int h_body, w_body, h_offset, v_offset;
int h_footer; int h_footer;
int btn_start, btn_width, btn_height; int btn_start, btn_width, btn_height;
bool imdb_activ; bool imdb_active;
void initFrame(); void initFrame();
void initMap(std::map<std::string, std::string>& my); void initMap(std::map<std::string, std::string>& my);
void bigFonts(bool on); void bigFonts(bool on);