From c68a67529c12b5b10b0c3d819beb61d3e7594413 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 12 Jan 2014 15:07:31 +0100 Subject: [PATCH] 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. --- lib/timerdclient/timerdclient.cpp | 3 ++- lib/timerdclient/timerdclient.h | 2 ++ src/gui/timerlist.cpp | 18 +++++++++--------- src/neutrino.cpp | 2 ++ src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 7 +++++-- .../tuxboxapi/coolstream/neutrinoapi.cpp | 2 ++ .../tuxboxapi/coolstream/neutrinoyparser.cpp | 2 +- src/timerd/timerd.cpp | 8 +++++++- src/timerd/timermanager.cpp | 8 +++++++- src/timerd/timermanager.h | 2 ++ 10 files changed, 39 insertions(+), 15 deletions(-) diff --git a/lib/timerdclient/timerdclient.cpp b/lib/timerdclient/timerdclient.cpp index 4258cfe37..2372a8a02 100644 --- a/lib/timerdclient/timerdclient.cpp +++ b/lib/timerdclient/timerdclient.cpp @@ -280,7 +280,8 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data, { length = 0; } - else if(evType == CTimerd::TIMER_NEXTPROGRAM || evType == CTimerd::TIMER_ZAPTO || + /* else if(evType == CTimerd::TIMER_NEXTPROGRAM || evType == CTimerd::TIMER_ZAPTO || */ + else if (evType == CTimerd::TIMER_ZAPTO || evType == CTimerd::TIMER_IMMEDIATE_RECORD ) { CTimerd::EventInfo *ei=static_cast(data); diff --git a/lib/timerdclient/timerdclient.h b/lib/timerdclient/timerdclient.h index 07e51f863..538ac3351 100644 --- a/lib/timerdclient/timerdclient.h +++ b/lib/timerdclient/timerdclient.h @@ -154,12 +154,14 @@ class CTimerdClient:private CBasicClient return addTimerEvent(CTimerd::TIMER_ZAPTO, &eventInfo, announcetime, alarmtime, stoptime); }; +#if 0 int addNextProgramTimerEvent(CTimerd::EventInfo eventInfo,time_t alarmtime, time_t announcetime = 0, time_t stoptime = 0) { // mal auf verdacht eingebaut // keine ahnung ob / was hier noch fehlt return addTimerEvent(CTimerd::TIMER_NEXTPROGRAM, &eventInfo, alarmtime, announcetime, stoptime); }; +#endif // Exit timerd and programm wakeup bool shutdown(); diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index bc166044d..f66dbd3d8 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -125,8 +125,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); } @@ -312,9 +312,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; @@ -763,7 +763,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 : { @@ -841,7 +841,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 += ' '; @@ -928,8 +928,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 : diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 29aab633e..aeacfae89 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1739,8 +1739,10 @@ void CNeutrinoApp::InitTimerdClient() g_Timerd = new CTimerdClient; g_Timerd->registerEvent(CTimerdClient::EVT_ANNOUNCE_SHUTDOWN, 222, NEUTRINO_UDS_NAME); g_Timerd->registerEvent(CTimerdClient::EVT_SHUTDOWN, 222, NEUTRINO_UDS_NAME); +#if 0 g_Timerd->registerEvent(CTimerdClient::EVT_ANNOUNCE_NEXTPROGRAM, 222, NEUTRINO_UDS_NAME); g_Timerd->registerEvent(CTimerdClient::EVT_NEXTPROGRAM, 222, NEUTRINO_UDS_NAME); +#endif g_Timerd->registerEvent(CTimerdClient::EVT_STANDBY_ON, 222, NEUTRINO_UDS_NAME); g_Timerd->registerEvent(CTimerdClient::EVT_STANDBY_OFF, 222, NEUTRINO_UDS_NAME); g_Timerd->registerEvent(CTimerdClient::EVT_ANNOUNCE_RECORD, 222, NEUTRINO_UDS_NAME); diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index cd299eaa4..696a9d8bd 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -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" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "\n",timer->channel_id); hh->printf("\t\t\t%s\n",channel_name.c_str()); hh->printf("\t\t\t%s\n",title.c_str()); } break; +#endif case CTimerd::TIMER_ZAPTO : { hh->printf("\t\t\t" PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS "\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) { diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp index fb952f2ff..f7d23babb 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp @@ -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; diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp index 0673b132b..28f6b49f4 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp @@ -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 : { diff --git a/src/timerd/timerd.cpp b/src/timerd/timerd.cpp index dc3595cca..60590e7ee 100644 --- a/src/timerd/timerd.cpp +++ b/src/timerd/timerd.cpp @@ -94,6 +94,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd) if(event->eventType == CTimerd::TIMER_STANDBY) resp.standby_on = static_cast(event)->standby_on; +#if 0 else if(event->eventType == CTimerd::TIMER_NEXTPROGRAM) { resp.epgID = static_cast(event)->eventInfo.epgID; @@ -101,6 +102,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd) resp.channel_id = static_cast(event)->eventInfo.channel_id; resp.apids = static_cast(event)->eventInfo.apids; } +#endif else if(event->eventType == CTimerd::TIMER_RECORD) { CTimerEvent_Record* ev= static_cast(event); @@ -159,6 +161,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd) if(event->eventType == CTimerd::TIMER_STANDBY) lresp.standby_on = static_cast(event)->standby_on; +#if 0 else if(event->eventType == CTimerd::TIMER_NEXTPROGRAM) { lresp.epgID = static_cast(event)->eventInfo.epgID; @@ -166,6 +169,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd) lresp.channel_id = static_cast(event)->eventInfo.channel_id; lresp.apids = static_cast(event)->eventInfo.apids; } +#endif else if(event->eventType == CTimerd::TIMER_RECORD) { CTimerEvent_Record* ev= static_cast(event); @@ -219,7 +223,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd) switch (*type) { case CTimerd::TIMER_SHUTDOWN: - case CTimerd::TIMER_NEXTPROGRAM: + //case CTimerd::TIMER_NEXTPROGRAM: case CTimerd::TIMER_ZAPTO: case CTimerd::TIMER_STANDBY: case CTimerd::TIMER_REMIND: @@ -348,6 +352,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd) } break; +#if 0 case CTimerd::TIMER_NEXTPROGRAM : // CTimerd::EventInfo evInfo; CBasicServer::receive_data(connfd, &evInfo, sizeof(CTimerd::TransferEventInfo)); @@ -376,6 +381,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd) } */ break; +#endif case CTimerd::TIMER_REMIND : CTimerdMsg::commandRemind remind; CBasicServer::receive_data(connfd, &remind, sizeof(CTimerdMsg::commandRemind)); diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index eec444d50..0c2f7135d 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -330,7 +330,7 @@ int CTimerManager::modifyEvent(int peventID, time_t announceTime, time_t alarmTi switch (event->eventType) { case CTimerd::TIMER_SHUTDOWN: - case CTimerd::TIMER_NEXTPROGRAM: + //case CTimerd::TIMER_NEXTPROGRAM: case CTimerd::TIMER_STANDBY: case CTimerd::TIMER_REMIND: case CTimerd::TIMER_SLEEPTIMER: @@ -456,6 +456,7 @@ void CTimerManager::loadEventsFromConfig() } break; } +#if 0 case CTimerd::TIMER_NEXTPROGRAM : { CTimerEvent_NextProgram *event= @@ -478,6 +479,7 @@ void CTimerManager::loadEventsFromConfig() } break; } +#endif case CTimerd::TIMER_ZAPTO : { CTimerEvent_Zapto *event= @@ -1315,6 +1317,8 @@ void CTimerEvent_Zapto::getEpgId() epgTitle=epgdata.title; } } + +#if 0 //============================================================= // NextProgram Event //============================================================= @@ -1394,6 +1398,8 @@ void CTimerEvent_NextProgram::Reschedule() eventInfo.epg_starttime = 0; CTimerEvent::Reschedule(); } +#endif + //============================================================= // Remind Event //============================================================= diff --git a/src/timerd/timermanager.h b/src/timerd/timermanager.h index 042b46655..26930d7a7 100644 --- a/src/timerd/timermanager.h +++ b/src/timerd/timermanager.h @@ -157,6 +157,7 @@ class CTimerEvent_Zapto : public CTimerEvent_Record virtual void getEpgId(); }; +#if 0 class CTimerEvent_NextProgram : public CTimerEvent { public: @@ -175,6 +176,7 @@ class CTimerEvent_NextProgram : public CTimerEvent virtual void saveToConfig(CConfigFile *config); virtual void Reschedule(); }; +#endif class CTimerEvent_Remind : public CTimerEvent {