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

shorten CNeutrinoEventlist to CEventlist

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6bf50f666
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)

Origin message was:
------------------
- shorten CNeutrinoEventlist to CEventlist

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-04-16 12:28:09 +02:00
parent 098e322feb
commit fa8192770f
5 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/global.h
View File

@@ -75,8 +75,8 @@ class CEpgData;
NEUTRINO_CPP CEpgData *g_EpgData; NEUTRINO_CPP CEpgData *g_EpgData;
class CInfoViewer; class CInfoViewer;
NEUTRINO_CPP CInfoViewer *g_InfoViewer; NEUTRINO_CPP CInfoViewer *g_InfoViewer;
class CNeutrinoEventList; class CEventList;
NEUTRINO_CPP CNeutrinoEventList *g_EventList; NEUTRINO_CPP CEventList *g_EventList;
class CLocaleManager; class CLocaleManager;
NEUTRINO_CPP CLocaleManager *g_Locale; NEUTRINO_CPP CLocaleManager *g_Locale;

2
src/gui/epgview.cpp
View File

@@ -912,7 +912,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
time_t tmp_sZeit = epgData.epg_times.startzeit; time_t tmp_sZeit = epgData.epg_times.startzeit;
uint64_t tmp_eID = epgData.eventID; uint64_t tmp_eID = epgData.eventID;
CNeutrinoEventList *ee = new CNeutrinoEventList; CEventList *ee = new CEventList;
res = ee->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT),"","",followlist); // UTF-8 res = ee->exec(channel_id, g_Locale->getText(LOCALE_EPGVIEWER_MORE_SCREENINGS_SHORT),"","",followlist); // UTF-8
delete ee; delete ee;
if (res == menu_return::RETURN_EXIT_ALL) if (res == menu_return::RETURN_EXIT_ALL)

72
src/gui/eventlist.cpp
View File

@@ -90,7 +90,7 @@ inline static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent&
return a.startTime < b.startTime; return a.startTime < b.startTime;
} }
CNeutrinoEventList::CNeutrinoEventList() CEventList::CEventList()
{ {
frameBuffer = CFrameBuffer::getInstance(); frameBuffer = CFrameBuffer::getInstance();
selected = 0; selected = 0;
@@ -116,11 +116,11 @@ CNeutrinoEventList::CNeutrinoEventList()
bgRightBoxPaint = false; bgRightBoxPaint = false;
} }
CNeutrinoEventList::~CNeutrinoEventList() CEventList::~CEventList()
{ {
} }
void CNeutrinoEventList::UpdateTimerList(void) void CEventList::UpdateTimerList(void)
{ {
timerlist.clear(); timerlist.clear();
g_Timerd->getTimerList (timerlist); g_Timerd->getTimerList (timerlist);
@@ -130,7 +130,7 @@ void CNeutrinoEventList::UpdateTimerList(void)
// Function: HasTimerConflicts // Function: HasTimerConflicts
// search for timer conflicts for given time // search for timer conflicts for given time
// return: true if found any conflict, you can watch with parameter epg_ID // return: true if found any conflict, you can watch with parameter epg_ID
bool CNeutrinoEventList::HasTimerConflicts(time_t starttime, time_t duration, event_id_t * epg_ID) bool CEventList::HasTimerConflicts(time_t starttime, time_t duration, event_id_t * epg_ID)
{ {
for(uint i= 0; i < timerlist.size(); i++) for(uint i= 0; i < timerlist.size(); i++)
@@ -146,7 +146,7 @@ bool CNeutrinoEventList::HasTimerConflicts(time_t starttime, time_t duration, ev
return false; return false;
} }
void CNeutrinoEventList::readEvents(const t_channel_id channel_id) void CEventList::readEvents(const t_channel_id channel_id)
{ {
CEitManager::getInstance()->getEventsServiceKey(channel_id , evtlist); CEitManager::getInstance()->getEventsServiceKey(channel_id , evtlist);
time_t azeit=time(NULL); time_t azeit=time(NULL);
@@ -242,7 +242,7 @@ void CNeutrinoEventList::readEvents(const t_channel_id channel_id)
} }
int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& channelname, const std::string& channelname_prev, const std::string& channelname_next,const CChannelEventList &followlist) // UTF-8 int CEventList::exec(const t_channel_id channel_id, const std::string& channelname, const std::string& channelname_prev, const std::string& channelname_next,const CChannelEventList &followlist) // UTF-8
{ {
neutrino_msg_t msg; neutrino_msg_t msg;
neutrino_msg_data_t data; neutrino_msg_data_t data;
@@ -290,7 +290,7 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
cc_infozone = new CComponentsText(x+width+10, y+theight, infozone_width-20, listmaxshow*fheight); cc_infozone = new CComponentsText(x+width+10, y+theight, infozone_width-20, listmaxshow*fheight);
int res = menu_return::RETURN_REPAINT; int res = menu_return::RETURN_REPAINT;
//printf("CNeutrinoEventList::exec: channel_id %llx\n", channel_id); //printf("CEventList::exec: channel_id %llx\n", channel_id);
if(m_search_list == SEARCH_LIST_NONE) // init globals once only if(m_search_list == SEARCH_LIST_NONE) // init globals once only
{ {
m_search_epg_item = SEARCH_EPG_TITLE; m_search_epg_item = SEARCH_EPG_TITLE;
@@ -467,7 +467,7 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
} }
else else
{ {
printf("[CNeutrinoEventList] no network devices available\n"); printf("[CEventList] no network devices available\n");
} }
if (id != -1) if (id != -1)
@@ -691,12 +691,12 @@ int CNeutrinoEventList::exec(const t_channel_id channel_id, const std::string& c
return res; return res;
} }
void CNeutrinoEventList::hide() void CEventList::hide()
{ {
frameBuffer->paintBackgroundBoxRel(x,y, full_width,height); frameBuffer->paintBackgroundBoxRel(x,y, full_width,height);
} }
CTimerd::CTimerEventTypes CNeutrinoEventList::isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID) CTimerd::CTimerEventTypes CEventList::isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID)
{ {
CTimerd::TimerList::iterator timer = timerlist.begin(); CTimerd::TimerList::iterator timer = timerlist.begin();
for(; timer != timerlist.end(); ++timer) { for(; timer != timerlist.end(); ++timer) {
@@ -713,7 +713,7 @@ CTimerd::CTimerEventTypes CNeutrinoEventList::isScheduled(t_channel_id channel_i
return (CTimerd::CTimerEventTypes) 0; return (CTimerd::CTimerEventTypes) 0;
} }
void CNeutrinoEventList::paintItem(unsigned int pos, t_channel_id channel_idI) void CEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
{ {
fb_pixel_t color; fb_pixel_t color;
fb_pixel_t bgcolor; fb_pixel_t bgcolor;
@@ -811,7 +811,7 @@ void CNeutrinoEventList::paintItem(unsigned int pos, t_channel_id channel_idI)
} }
} }
void CNeutrinoEventList::paintDescription(int index) void CEventList::paintDescription(int index)
{ {
if (!g_settings.eventlist_additional) if (!g_settings.eventlist_additional)
return; return;
@@ -849,7 +849,7 @@ void CNeutrinoEventList::paintDescription(int index)
cc_infozone->paint(CC_SAVE_SCREEN_NO); cc_infozone->paint(CC_SAVE_SCREEN_NO);
} }
void CNeutrinoEventList::paintHead(t_channel_id _channel_id, std::string _channelname, std::string _channelname_prev, std::string _channelname_next) void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, std::string _channelname_prev, std::string _channelname_next)
{ {
CComponentsHeader* header = NULL; CComponentsHeader* header = NULL;
CComponentsChannelLogo* midLogo = NULL; CComponentsChannelLogo* midLogo = NULL;
@@ -918,7 +918,7 @@ void CNeutrinoEventList::paintHead(t_channel_id _channel_id, std::string _channe
if (header) delete header; if (header) delete header;
} }
void CNeutrinoEventList::paint(t_channel_id channel_id) void CEventList::paint(t_channel_id channel_id)
{ {
liststart = (selected/listmaxshow)*listmaxshow; liststart = (selected/listmaxshow)*listmaxshow;
@@ -949,7 +949,7 @@ void CNeutrinoEventList::paint(t_channel_id channel_id)
} }
void CNeutrinoEventList::showFunctionBar (bool show, t_channel_id channel_id) void CEventList::showFunctionBar (bool show, t_channel_id channel_id)
{ {
int bx = x; int bx = x;
int bw = full_width; int bw = full_width;
@@ -1032,7 +1032,7 @@ int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*
if (parent) { if (parent) {
parent->hide(); parent->hide();
} }
CNeutrinoEventList *e = new CNeutrinoEventList; CEventList *e = new CEventList;
CChannelList *channelList = CNeutrinoApp::getInstance()->channelList; CChannelList *channelList = CNeutrinoApp::getInstance()->channelList;
e->exec(CZapit::getInstance()->GetCurrentChannelID(), channelList->getActiveChannelName()); // UTF-8 e->exec(CZapit::getInstance()->GetCurrentChannelID(), channelList->getActiveChannelName()); // UTF-8
delete e; delete e;
@@ -1041,7 +1041,7 @@ int CEventListHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*
} }
/************************************************************************************************/ /************************************************************************************************/
bool CNeutrinoEventList::findEvents(void) bool CEventList::findEvents(void)
/************************************************************************************************/ /************************************************************************************************/
{ {
bool res = false; bool res = false;
@@ -1204,22 +1204,22 @@ bool CEventFinderMenuHandler::changeNotify(const neutrino_locale_t OptionName, v
#define SEARCH_LIST_OPTION_COUNT 3 #define SEARCH_LIST_OPTION_COUNT 3
const CMenuOptionChooser::keyval SEARCH_LIST_OPTIONS[SEARCH_LIST_OPTION_COUNT] = const CMenuOptionChooser::keyval SEARCH_LIST_OPTIONS[SEARCH_LIST_OPTION_COUNT] =
{ {
// { CNeutrinoEventList::SEARCH_LIST_NONE, LOCALE_PICTUREVIEWER_RESIZE_NONE }, // { CEventList::SEARCH_LIST_NONE, LOCALE_PICTUREVIEWER_RESIZE_NONE },
{ CNeutrinoEventList::SEARCH_LIST_CHANNEL, LOCALE_TIMERLIST_CHANNEL }, { CEventList::SEARCH_LIST_CHANNEL, LOCALE_TIMERLIST_CHANNEL },
{ CNeutrinoEventList::SEARCH_LIST_BOUQUET, LOCALE_BOUQUETLIST_HEAD }, { CEventList::SEARCH_LIST_BOUQUET, LOCALE_BOUQUETLIST_HEAD },
{ CNeutrinoEventList::SEARCH_LIST_ALL, LOCALE_CHANNELLIST_HEAD } { CEventList::SEARCH_LIST_ALL, LOCALE_CHANNELLIST_HEAD }
}; };
#define SEARCH_EPG_OPTION_COUNT 4 #define SEARCH_EPG_OPTION_COUNT 4
const CMenuOptionChooser::keyval SEARCH_EPG_OPTIONS[SEARCH_EPG_OPTION_COUNT] = const CMenuOptionChooser::keyval SEARCH_EPG_OPTIONS[SEARCH_EPG_OPTION_COUNT] =
{ {
// { CNeutrinoEventList::SEARCH_EPG_NONE, LOCALE_PICTUREVIEWER_RESIZE_NONE }, // { CEventList::SEARCH_EPG_NONE, LOCALE_PICTUREVIEWER_RESIZE_NONE },
{ CNeutrinoEventList::SEARCH_EPG_TITLE, LOCALE_FONTSIZE_EPG_TITLE }, { CEventList::SEARCH_EPG_TITLE, LOCALE_FONTSIZE_EPG_TITLE },
{ CNeutrinoEventList::SEARCH_EPG_INFO1, LOCALE_FONTSIZE_EPG_INFO1 }, { CEventList::SEARCH_EPG_INFO1, LOCALE_FONTSIZE_EPG_INFO1 },
{ CNeutrinoEventList::SEARCH_EPG_INFO2, LOCALE_FONTSIZE_EPG_INFO2 }, { CEventList::SEARCH_EPG_INFO2, LOCALE_FONTSIZE_EPG_INFO2 },
// { CNeutrinoEventList::SEARCH_EPG_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MAJOR }, // { CEventList::SEARCH_EPG_GENRE, LOCALE_MOVIEBROWSER_INFO_GENRE_MAJOR },
{ CNeutrinoEventList::SEARCH_EPG_ALL, LOCALE_EVENTFINDER_SEARCH_ALL_EPG } { CEventList::SEARCH_EPG_ALL, LOCALE_EVENTFINDER_SEARCH_ALL_EPG }
}; };
@@ -1267,7 +1267,7 @@ int CEventFinderMenu::exec(CMenuTarget* parent, const std::string &actionkey)
{ {
//printf("3\n"); //printf("3\n");
// get channel id / bouquet id // get channel id / bouquet id
if(*m_search_list == CNeutrinoEventList::SEARCH_LIST_CHANNEL) if(*m_search_list == CEventList::SEARCH_LIST_CHANNEL)
{ {
int nNewBouquet; int nNewBouquet;
nNewBouquet = bouquetList->show(); nNewBouquet = bouquetList->show();
@@ -1285,7 +1285,7 @@ int CEventFinderMenu::exec(CMenuTarget* parent, const std::string &actionkey)
} }
} }
} }
else if(*m_search_list == CNeutrinoEventList::SEARCH_LIST_BOUQUET) else if(*m_search_list == CEventList::SEARCH_LIST_BOUQUET)
{ {
int nNewBouquet; int nNewBouquet;
nNewBouquet = bouquetList->show(); nNewBouquet = bouquetList->show();
@@ -1342,11 +1342,11 @@ int CEventFinderMenu::showMenu(void)
m_search_channelname_mf = NULL; m_search_channelname_mf = NULL;
*m_event = false; *m_event = false;
if(*m_search_list == CNeutrinoEventList::SEARCH_LIST_CHANNEL) if(*m_search_list == CEventList::SEARCH_LIST_CHANNEL)
{ {
m_search_channelname = CServiceManager::getInstance()->GetServiceName(*m_search_channel_id); m_search_channelname = CServiceManager::getInstance()->GetServiceName(*m_search_channel_id);
} }
else if(*m_search_list == CNeutrinoEventList::SEARCH_LIST_BOUQUET) else if(*m_search_list == CEventList::SEARCH_LIST_BOUQUET)
{ {
if (*m_search_bouquet_id >= bouquetList->Bouquets.size()){ if (*m_search_bouquet_id >= bouquetList->Bouquets.size()){
*m_search_bouquet_id = bouquetList->getActiveBouquetNumber(); *m_search_bouquet_id = bouquetList->getActiveBouquetNumber();
@@ -1356,7 +1356,7 @@ int CEventFinderMenu::showMenu(void)
else else
m_search_channelname =""; m_search_channelname ="";
} }
else if(*m_search_list == CNeutrinoEventList::SEARCH_LIST_ALL) else if(*m_search_list == CEventList::SEARCH_LIST_ALL)
{ {
m_search_channelname =""; m_search_channelname ="";
} }
@@ -1367,7 +1367,7 @@ int CEventFinderMenu::showMenu(void)
CMenuForwarder* mf0 = new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_red); CMenuForwarder* mf0 = new CMenuForwarder(LOCALE_EVENTFINDER_KEYWORD, true, *m_search_keyword, &stringInput, NULL, CRCInput::RC_red);
CMenuOptionChooser* mo0 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST, m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++)); CMenuOptionChooser* mo0 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST, m_search_list, SEARCH_LIST_OPTIONS, SEARCH_LIST_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++));
m_search_channelname_mf = new CMenuForwarder("", *m_search_list != CNeutrinoEventList::SEARCH_LIST_ALL, m_search_channelname, this, "#2", CRCInput::convertDigitToKey(shortcut++)); m_search_channelname_mf = new CMenuForwarder("", *m_search_list != CEventList::SEARCH_LIST_ALL, m_search_channelname, this, "#2", CRCInput::convertDigitToKey(shortcut++));
CMenuOptionChooser* mo1 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_EPG, m_search_epg_item, SEARCH_EPG_OPTIONS, SEARCH_EPG_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++)); CMenuOptionChooser* mo1 = new CMenuOptionChooser(LOCALE_EVENTFINDER_SEARCH_WITHIN_EPG, m_search_epg_item, SEARCH_EPG_OPTIONS, SEARCH_EPG_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++));
CMenuForwarder* mf1 = new CMenuForwarder(LOCALE_EVENTFINDER_START_SEARCH, true, NULL, this, "#1", CRCInput::RC_green); CMenuForwarder* mf1 = new CMenuForwarder(LOCALE_EVENTFINDER_START_SEARCH, true, NULL, this, "#1", CRCInput::RC_green);
@@ -1401,12 +1401,12 @@ bool CEventFinderMenu::changeNotify(const neutrino_locale_t OptionName, void *)
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST)) if (ARE_LOCALES_EQUAL(OptionName, LOCALE_EVENTFINDER_SEARCH_WITHIN_LIST))
{ {
if (*m_search_list == CNeutrinoEventList::SEARCH_LIST_CHANNEL) if (*m_search_list == CEventList::SEARCH_LIST_CHANNEL)
{ {
m_search_channelname = g_Zapit->getChannelName(*m_search_channel_id); m_search_channelname = g_Zapit->getChannelName(*m_search_channel_id);
m_search_channelname_mf->setActive(true); m_search_channelname_mf->setActive(true);
} }
else if (*m_search_list == CNeutrinoEventList::SEARCH_LIST_BOUQUET) else if (*m_search_list == CEventList::SEARCH_LIST_BOUQUET)
{ {
if (*m_search_bouquet_id >= bouquetList->Bouquets.size()){ if (*m_search_bouquet_id >= bouquetList->Bouquets.size()){
*m_search_bouquet_id = bouquetList->getActiveBouquetNumber(); *m_search_bouquet_id = bouquetList->getActiveBouquetNumber();
@@ -1416,7 +1416,7 @@ bool CEventFinderMenu::changeNotify(const neutrino_locale_t OptionName, void *)
m_search_channelname_mf->setActive(true); m_search_channelname_mf->setActive(true);
} }
} }
else if (*m_search_list == CNeutrinoEventList::SEARCH_LIST_ALL) else if (*m_search_list == CEventList::SEARCH_LIST_ALL)
{ {
m_search_channelname = ""; m_search_channelname = "";
m_search_channelname_mf->setActive(false); m_search_channelname_mf->setActive(false);

6
src/gui/eventlist.h
View File

@@ -44,7 +44,7 @@
#include <string> #include <string>
class CNeutrinoEventList class CEventList
{ {
// Eventfinder start // Eventfinder start
public: public:
@@ -124,8 +124,8 @@ class CNeutrinoEventList
CTimerd::CTimerEventTypes isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID = NULL); CTimerd::CTimerEventTypes isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID = NULL);
public: public:
CNeutrinoEventList(); CEventList();
~CNeutrinoEventList(); ~CEventList();
int exec(const t_channel_id channel_id, const std::string& channelname, const std::string& prev = "", const std::string& next = "", const CChannelEventList &followlist = CChannelEventList ()); // UTF-8 int exec(const t_channel_id channel_id, const std::string& channelname, const std::string& prev = "", const std::string& next = "", const CChannelEventList &followlist = CChannelEventList ()); // UTF-8
}; };

2
src/neutrino.cpp
View File

@@ -2008,7 +2008,7 @@ TIMER_START();
g_RemoteControl = new CRemoteControl; g_RemoteControl = new CRemoteControl;
g_EpgData = new CEpgData; g_EpgData = new CEpgData;
g_InfoViewer = new CInfoViewer; g_InfoViewer = new CInfoViewer;
g_EventList = new CNeutrinoEventList; g_EventList = new CEventList;
g_CamHandler = new CCAMMenuHandler(); g_CamHandler = new CCAMMenuHandler();
g_CamHandler->init(); g_CamHandler->init();