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.


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

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<CTimerEvent_Standby*>(event)->standby_on;
+#if 0
 					else if(event->eventType == CTimerd::TIMER_NEXTPROGRAM)
 					{
 						resp.epgID = static_cast<CTimerEvent_NextProgram*>(event)->eventInfo.epgID;
@@ -101,6 +102,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
 						resp.channel_id = static_cast<CTimerEvent_NextProgram*>(event)->eventInfo.channel_id;
 						resp.apids = static_cast<CTimerEvent_Record*>(event)->eventInfo.apids;
 					}
+#endif
 					else if(event->eventType == CTimerd::TIMER_RECORD)
 					{
 						CTimerEvent_Record* ev= static_cast<CTimerEvent_Record*>(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<CTimerEvent_Standby*>(event)->standby_on;
+#if 0
 					else if(event->eventType == CTimerd::TIMER_NEXTPROGRAM)
 					{
 						lresp.epgID = static_cast<CTimerEvent_NextProgram*>(event)->eventInfo.epgID;
@@ -166,6 +169,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
 						lresp.channel_id = static_cast<CTimerEvent_NextProgram*>(event)->eventInfo.channel_id;
 						lresp.apids = static_cast<CTimerEvent_Record*>(event)->eventInfo.apids;
 					}
+#endif
 					else if(event->eventType == CTimerd::TIMER_RECORD)
 					{
 						CTimerEvent_Record* ev= static_cast<CTimerEvent_Record*>(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));

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
 //=============================================================

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
 {