mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +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.

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-07-23 19:48:47 +02:00
committed by Thilo Graf
parent f7025a9a7d
commit edf89c5538
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

@@ -1459,38 +1459,6 @@ void EpgPlus::paint()
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)
{
this->epgPlus = pepgPlus;
@@ -1655,3 +1623,34 @@ int EpgPlus::MenuOptionChooserSwitchViewMode::exec(CMenuTarget * parent)
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;
}