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

CChannelList: remove unused logo object

Browse Source 
Not required since
7c03858f7c: add possibility to show channellogo


Origin commit data
------------------
Branch: ni/coolstream
Commit: fbe8889fa9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2017-04-23 13:42:50 +02:00
parent 9570a9d36a
commit 000595e6b7
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/channellist.cpp
View File

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