mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +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.


Origin commit data
------------------
Branch: ni/coolstream
Commit: c68a67529c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-12 15:07:31 +01:00
parent 719131cdc0
commit 525fd6261b
10 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
View File

@@ -1715,7 +1715,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)
@@ -1894,12 +1894,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);
@@ -2272,7 +2274,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)
{

2
src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
View File

@@ -320,9 +320,11 @@ std::string CNeutrinoAPI::timerEventType2Str(CTimerd::CTimerEventTypes type)
case CTimerd::TIMER_SHUTDOWN:
result = "Shutdown";
break;
#if 0
case CTimerd::TIMER_NEXTPROGRAM:
result = "Next program";
break;
#endif
case CTimerd::TIMER_ZAPTO:
result = "Zap to";
break;

2
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -813,7 +813,7 @@ std::string CNeutrinoYParser::func_get_timer_list(CyhookHandler *, std::string
std::string sAddData="";
switch(timer->eventType)
{
case CTimerd::TIMER_NEXTPROGRAM :
//case CTimerd::TIMER_NEXTPROGRAM :
case CTimerd::TIMER_ZAPTO :
case CTimerd::TIMER_RECORD :
{