timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM

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

View File

@@ -1711,7 +1711,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
}
switch(timer->eventType) {
case CTimerd::TIMER_NEXTPROGRAM:
//case CTimerd::TIMER_NEXTPROGRAM:
case CTimerd::TIMER_ZAPTO:
case CTimerd::TIMER_RECORD:
if (!send_id)
@@ -1890,12 +1890,14 @@ void CControlAPI::SendTimersXML(CyhookHandler *hh)
// timer specific data
switch(timer->eventType)
{
#if 0
case CTimerd::TIMER_NEXTPROGRAM : {
hh->printf("\t\t\t<channel_id>" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "</channel_id>\n",timer->channel_id);
hh->printf("\t\t\t<channel_name>%s</channel_name>\n",channel_name.c_str());
hh->printf("\t\t\t<title>%s</title>\n",title.c_str());
}
break;
#endif
case CTimerd::TIMER_ZAPTO : {
hh->printf("\t\t\t<channel_id>" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "</channel_id>\n",timer->channel_id);
@@ -2268,7 +2270,8 @@ void CControlAPI::doNewTimer(CyhookHandler *hh)
bool standby_on = (hh->ParamList["sbon"]=="1");
data=&standby_on;
}
else if(type==CTimerd::TIMER_NEXTPROGRAM || type==CTimerd::TIMER_ZAPTO)
/* else if(type==CTimerd::TIMER_NEXTPROGRAM || type==CTimerd::TIMER_ZAPTO) */
else if (type == CTimerd::TIMER_ZAPTO)
data= &eventinfo;
else if (type==CTimerd::TIMER_RECORD)
{