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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c926f1ea91
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-05-07 18:27:59 +02:00
parent 34ad84d6b4 cb07bd9bbc
commit bcc9e29ffe
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/channellist.cpp
View File

@@ -122,7 +122,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
previous_channellist_additional = -1; previous_channellist_additional = -1;
eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT; eventFont = SNeutrinoSettings::FONT_TYPE_CHANNELLIST_EVENT;
dline = NULL; dline = NULL;
cc_minitv = NULL;
minitv_is_active = false; minitv_is_active = false;
headerNew = true; headerNew = true;
bouquet = NULL; bouquet = NULL;
@@ -133,6 +133,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
paint_events_index = -2; paint_events_index = -2;
CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules)); CFrameBuffer::getInstance()->OnAfterSetPallette.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
CNeutrinoApp::getInstance()->OnAfterSetupFonts.connect(sigc::mem_fun(this, &CChannelList::ResetModules));
} }
CChannelList::~CChannelList() CChannelList::~CChannelList()
@@ -952,9 +953,9 @@ void CChannelList::hide()
paint_events(-2); // cancel paint_events thread paint_events(-2); // cancel paint_events thread
if ((g_settings.channellist_additional == 2) || (previous_channellist_additional == 2)) // with miniTV if ((g_settings.channellist_additional == 2) || (previous_channellist_additional == 2)) // with miniTV
{ {
if (cc_minitv) if (cc_minitv){
delete cc_minitv; delete cc_minitv; cc_minitv = NULL;
cc_minitv = NULL; }
} }
if(header) if(header)
header->kill(); header->kill();
@@ -2162,13 +2163,17 @@ void CChannelList::paintHead()
CComponentsHeader* CChannelList::getHeaderObject() CComponentsHeader* CChannelList::getHeaderObject()
{ {
return header; if (header)
return header;
return NULL;
} }
void CChannelList::ResetModules() void CChannelList::ResetModules()
{ {
delete header; if (header){
header = NULL; delete header;
header = NULL;
}
if(dline){ if(dline){
delete dline; delete dline;
dline = NULL; dline = NULL;

2
src/gui/channellist.h
View File

@@ -67,7 +67,7 @@ enum {
class CFrameBuffer; class CFrameBuffer;
class CBouquet; class CBouquet;
class CChannelList : public CListHelpers class CChannelList : public CListHelpers, public sigc::trackable
{ {
private: private:
enum state_ enum state_

7
src/gui/epgview.cpp
View File

@@ -127,10 +127,6 @@ CEpgData::CEpgData()
mp_movie_info = NULL; mp_movie_info = NULL;
header = NULL; header = NULL;
Bottombox = NULL; Bottombox = NULL;
lpic = NULL;
rpic = NULL;
lText = NULL;
rText = NULL;
pb = NULL; pb = NULL;
font_title = NULL; font_title = NULL;
} }
@@ -1524,9 +1520,6 @@ void CEpgData::ResetModules()
} }
if (Bottombox){ if (Bottombox){
delete Bottombox; Bottombox = NULL; delete Bottombox; Bottombox = NULL;
// bottom box items are destroyed but explicit reset of bottom box items here required
lpic = rpic = NULL;
lText = rText = NULL;
} }
if (pb){ if (pb){
delete pb; pb = NULL; delete pb; pb = NULL;

2
src/gui/epgview.h
View File

@@ -52,8 +52,6 @@ class CEpgData
CEPGData epgData; CEPGData epgData;
CComponentsHeader *header; CComponentsHeader *header;
CNaviBar *Bottombox; CNaviBar *Bottombox;
CComponentsPictureScalable *lpic, *rpic;
CComponentsText *lText, *rText;
CProgressBar *pb; CProgressBar *pb;
Font *font_title; Font *font_title;
std::string epg_date; std::string epg_date;