CChannelList: remove unused logo object

Not required since
68835056c3: add possibility to show channellogo
This commit is contained in:
2017-04-23 13:42:50 +02:00
parent 330171c90b
commit fbe8889fa9

View File

@@ -96,7 +96,6 @@ extern bool autoshift;
static CComponentsPIP *cc_minitv = NULL;
extern CBouquetManager *g_bouquetManager;
extern int old_b_id;
static CComponentsChannelLogoScalable* CChannelLogo = NULL;
static CComponentsHeader *header = NULL;
extern bool timeset;
@@ -126,7 +125,6 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
cc_minitv = NULL;
logo_off = 0;
minitv_is_active = false;
CChannelLogo = NULL;
headerNew = true;
bouquet = NULL;
chanlist = &channels;
@@ -955,11 +953,6 @@ void CChannelList::hide()
}
if(header)
header->kill();
if (CChannelLogo){
CChannelLogo->kill();
delete CChannelLogo;
CChannelLogo = NULL;
}
frameBuffer->paintBackgroundBoxRel(x, y, full_width, height + OFFSET_INTER + info_height);
clearItem2DetailsLine();
@@ -2130,11 +2123,6 @@ void CChannelList::paintHead()
header->setCaption(header_txt, CTextBox::NO_AUTO_LINEBREAK, header_txt_col);
if (header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0)){
if (CChannelLogo)
CChannelLogo->clearFbData();
}
if (timeset) {
if(!edit_state){
if (header->getContextBtnObject())
@@ -2181,10 +2169,6 @@ void CChannelList::ResetModules()
delete cc_minitv;
cc_minitv = NULL;
}
if (CChannelLogo) {
delete CChannelLogo;
CChannelLogo = NULL;
}
}
void CChannelList::paintBody()