mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM

Browse Source 
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
This commit is contained in:
Stefan Seyfried
2014-01-12 15:07:31 +01:00
committed by svenhoefer
parent ecf430ba97
commit 49035cedec
10 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/timerlist.cpp
View File

@@ -123,8 +123,8 @@ public:
m6->setActive(false);
}
if (type == CTimerd::TIMER_RECORD ||
type == CTimerd::TIMER_ZAPTO ||
type == CTimerd::TIMER_NEXTPROGRAM)
type == CTimerd::TIMER_ZAPTO)
/*|| type == CTimerd::TIMER_NEXTPROGRAM)*/
{
m2->setActive(true);
}
@@ -310,9 +310,9 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
void *data=NULL;
if (timerNew.eventType == CTimerd::TIMER_STANDBY)
data=&(timerNew.standby_on);
else if (timerNew.eventType==CTimerd::TIMER_NEXTPROGRAM ||
timerNew.eventType==CTimerd::TIMER_ZAPTO ||
timerNew.eventType==CTimerd::TIMER_RECORD)
/* else if (timerNew.eventType==CTimerd::TIMER_NEXTPROGRAM || */
else if (timerNew.eventType == CTimerd::TIMER_ZAPTO ||
timerNew.eventType == CTimerd::TIMER_RECORD)
{
if (strcmp(timerNew_channel_name, "---")==0)
return menu_return::RETURN_REPAINT;
@@ -761,7 +761,7 @@ void CTimerList::paintItem(int pos)
std::string zAddData("");
switch (timer.eventType)
{
case CTimerd::TIMER_NEXTPROGRAM :
//case CTimerd::TIMER_NEXTPROGRAM :
case CTimerd::TIMER_ZAPTO :
case CTimerd::TIMER_RECORD :
{
@@ -839,7 +839,7 @@ void CTimerList::paintItem(int pos)
case CTimerd::TIMER_RECORD :
// line2+= " -";
// line2+= zStopTime+6;
case CTimerd::TIMER_NEXTPROGRAM :
//case CTimerd::TIMER_NEXTPROGRAM :
case CTimerd::TIMER_ZAPTO :
{
line1 += ' ';
@@ -927,8 +927,8 @@ const char * CTimerList::convertTimerType2String(const CTimerd::CTimerEventTypes
{
case CTimerd::TIMER_SHUTDOWN :
return g_Locale->getText(LOCALE_TIMERLIST_TYPE_SHUTDOWN );
case CTimerd::TIMER_NEXTPROGRAM :
return g_Locale->getText(LOCALE_TIMERLIST_TYPE_NEXTPROGRAM);
// case CTimerd::TIMER_NEXTPROGRAM :
// return g_Locale->getText(LOCALE_TIMERLIST_TYPE_NEXTPROGRAM);
case CTimerd::TIMER_ZAPTO :
return g_Locale->getText(LOCALE_TIMERLIST_TYPE_ZAPTO );
case CTimerd::TIMER_STANDBY :