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

epgplus: move CEPGplusHandler::exec() code to end of file; ...

Browse Source 
* really minor code changes in CEPGDataHandler::exec() and
 CEventListHandler::exec()

No binary changes, just code cosmetic.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a4397b3f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-23 (Mon, 23 Jul 2018)

Origin message was:
------------------
- epgplus: move CEPGplusHandler::exec() code to end of file; ...

* really minor code changes in CEPGDataHandler::exec() and
 CEventListHandler::exec()

No binary changes, just code cosmetic.


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-07-23 19:48:47 +02:00
parent b56357a43a
commit c76c28b675
5 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/gui/epgplus.cpp
View File

@@ -1455,38 +1455,6 @@ void EpgPlus::paint()
paintScrollBar(this->sliderX, this->sliderY, this->sliderWidth, this->sliderHeight, total_pages, current_page, CC_SHADOW_RIGHT_CORNER_ALL); paintScrollBar(this->sliderX, this->sliderY, this->sliderWidth, this->sliderHeight, total_pages, current_page, CC_SHADOW_RIGHT_CORNER_ALL);
} }
// -- EPG+ Menue Handler Class
// -- to be used for calls from Menue
// -- (2004-03-05 rasc)
int CEPGplusHandler::exec(CMenuTarget * parent, const std::string & /*actionKey*/)
{
int res = menu_return::RETURN_EXIT_ALL;
EpgPlus *e;
CChannelList *channelList;
if (parent)
parent->hide();
e = new EpgPlus;
//channelList = CNeutrinoApp::getInstance()->channelList;
int bnum = bouquetList->getActiveBouquetNumber();
current_bouquet = bnum;
if (!bouquetList->Bouquets.empty() && !bouquetList->Bouquets[bnum]->channelList->isEmpty())
channelList = bouquetList->Bouquets[bnum]->channelList;
else
channelList = CNeutrinoApp::getInstance()->channelList;
e->exec(channelList, channelList->getSelectedChannelIndex(), bouquetList);
delete e;
// FIXME
//printf("CEPGplusHandler::exec old bouquet %d new %d current %d\n", bnum, bouquetList->getActiveBouquetNumber(), current_bouquet);
bouquetList->activateBouquet(current_bouquet, false);
return res;
}
EpgPlus::MenuTargetAddReminder::MenuTargetAddReminder(EpgPlus * pepgPlus) EpgPlus::MenuTargetAddReminder::MenuTargetAddReminder(EpgPlus * pepgPlus)
{ {
this->epgPlus = pepgPlus; this->epgPlus = pepgPlus;
@@ -1651,3 +1619,34 @@ int EpgPlus::MenuOptionChooserSwitchViewMode::exec(CMenuTarget * parent)
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
} }
// -- EPG+ Menu Handler Class
// -- to be used for calls from Menu
int CEPGplusHandler::exec(CMenuTarget * parent, const std::string & /*actionKey*/)
{
int res = menu_return::RETURN_EXIT_ALL;
EpgPlus *e;
CChannelList *channelList;
if (parent)
parent->hide();
e = new EpgPlus;
//channelList = CNeutrinoApp::getInstance()->channelList;
int bnum = bouquetList->getActiveBouquetNumber();
current_bouquet = bnum;
if (!bouquetList->Bouquets.empty() && !bouquetList->Bouquets[bnum]->channelList->isEmpty())
channelList = bouquetList->Bouquets[bnum]->channelList;
else
channelList = CNeutrinoApp::getInstance()->channelList;
e->exec(channelList, channelList->getSelectedChannelIndex(), bouquetList);
delete e;
// FIXME
//printf("CEPGplusHandler::exec old bouquet %d new %d current %d\n", bnum, bouquetList->getActiveBouquetNumber(), current_bouquet);
bouquetList->activateBouquet(current_bouquet, false);
return res;
}

3
src/gui/epgview.cpp
View File

@@ -1724,8 +1724,7 @@ void CEpgData::ResetModules()
} }
// -- EPG Data Viewer Menu Handler Class // -- EPG Data Viewer Menu Handler Class
// -- to be used for calls from Menue // -- to be used for calls from Menu
// -- (2004-03-06 rasc)
int CEPGDataHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/) int CEPGDataHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/)
{ {

4
src/gui/epgview.h
View File

@@ -119,12 +119,10 @@ class CEpgData
void ResetModules(); void ResetModules();
}; };
class CEPGDataHandler : public CMenuTarget class CEPGDataHandler : public CMenuTarget
{ {
public: public:
int exec( CMenuTarget* parent, const std::string &actionkey); int exec(CMenuTarget* parent, const std::string &actionkey);
}; };

5
src/gui/eventlist.cpp
View File

@@ -1067,6 +1067,9 @@ void CEventList::paintFoot(t_channel_id channel_id)
footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, full_width, footer_height, btn_cnt, buttons); footer.paintButtons(x, y + height - OFFSET_SHADOW - footer_height, full_width, footer_height, btn_cnt, buttons);
} }
// -- Eventlist Menu Handler Class
// -- to be used for calls from Menu
int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/) int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/)
{ {
int res = menu_return::RETURN_EXIT_ALL; int res = menu_return::RETURN_EXIT_ALL;
@@ -1075,7 +1078,7 @@ int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*
parent->hide(); parent->hide();
CEventList *e = new CEventList; CEventList *e = new CEventList;
CChannelList *channelList = CNeutrinoApp::getInstance()->channelList; CChannelList *channelList = CNeutrinoApp::getInstance()->channelList;
e->exec(CZapit::getInstance()->GetCurrentChannelID(), channelList->getActiveChannelName()); e->exec(CZapit::getInstance()->GetCurrentChannelID(), channelList->getActiveChannelName());
delete e; delete e;

2
src/gui/eventlist.h
View File

@@ -133,7 +133,7 @@ class CEventList : public CListHelpers
class CEventListHandler : public CMenuTarget class CEventListHandler : public CMenuTarget
{ {
public: public:
int exec( CMenuTarget* parent, const std::string &actionkey); int exec(CMenuTarget* parent, const std::string &actionkey);
}; };
class CEventFinderMenu : public CMenuTarget, CChangeObserver class CEventFinderMenu : public CMenuTarget, CChangeObserver