Merge remote-tracking branch 'tuxbox/master'

* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit

src/timerd/timerd.cpp

@@ -303,7 +303,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
 
 					CTimerd::TransferRecordingInfo recInfo;
 					CBasicServer::receive_data(connfd, &recInfo, sizeof(CTimerd::TransferRecordingInfo));
-				   if(recInfo.recordingSafety)
+					if(recInfo.recordingSafety)
 					{
 						int pre,post;
 						CTimerManager::getInstance()->getRecordingSafety(pre,post);
@@ -321,7 +321,9 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
 						recInfo.apids,
 						msgAddTimer.eventRepeat,
 						msgAddTimer.repeatCount,
-						recInfo.recordingDir);
+						recInfo.recordingDir,
+						recInfo.recordingSafety,
+						recInfo.autoAdjustToEPG);
 					rspAddTimer.eventID = CTimerManager::getInstance()->addEvent(event);
 
 					break;

src/timerd/timermanager.cpp

@@ -814,7 +814,7 @@ CTimerEvent::CTimerEvent( CTimerd::CTimerEventTypes evtype, time_t announcetime,
 	stopTime = stoptime;
 	repeatCount = repeatcount;
 	previousState = CTimerd::TIMERSTATE_SCHEDULED;
-
+#if 0 //never used
 	time_t diff = 0;
 	time_t mtime = time(NULL);
 	struct tm *tmtime = localtime(&mtime);
@@ -832,6 +832,7 @@ CTimerEvent::CTimerEvent( CTimerd::CTimerEventTypes evtype, time_t announcetime,
 	{
 		diff+=3600;
 	}
+#endif
 #if 0 //FIXME EPG vs manual timer ?
 	printf("############## CTimerEvent dst %d -> %d diff %d\n", isdst1, isdst2, diff);
 	alarmTime += diff;
@@ -1131,7 +1132,8 @@ CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time,
 				       event_id_t epgID,
 				       time_t epg_starttime, unsigned char apids,
 				       CTimerd::CTimerEventRepeat evrepeat,
-				       uint32_t repeatcount, const std::string &recDir) :
+				       uint32_t repeatcount, const std::string &recDir,
+				       bool _recordingSafety, bool _autoAdjustToEPG) :
 	CTimerEvent(getEventType(), announce_Time, alarm_Time, stop_Time, evrepeat, repeatcount)
 {
 	eventInfo.epgID = epgID;
@@ -1140,6 +1142,8 @@ CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time,
 	eventInfo.apids = apids;
 	recordingDir = recDir;
 	epgTitle="";
+	autoAdjustToEPG = _autoAdjustToEPG;
+	recordingSafety = _recordingSafety;
 	CShortEPGData epgdata;
 	if (CEitManager::getInstance()->getEPGidShort(epgID, &epgdata))
 		epgTitle=epgdata.title;
@@ -1169,11 +1173,19 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId):
 
 	epgTitle = config->getString("EPG_TITLE_"+id);
 	dprintf("read EPG_TITLE_%s %s (%p)\n",id.c_str(),epgTitle.c_str(),&epgTitle);
+
+	recordingSafety = config->getInt32("RECORDING_SAFETY_"+id, true);
+	dprintf("read RECORDING_SAFETY_%s %d\n",id.c_str(), recordingSafety);
+
+	autoAdjustToEPG = config->getInt32("EPG_AUTO_ADJUST_"+id, true);
+	dprintf("read EPG_AUTO_ADJUST_TO_EPG_%s %d\n",id.c_str(), autoAdjustToEPG);
 }
 //------------------------------------------------------------
 void CTimerEvent_Record::fireEvent()
 {
-	Refresh();
+	if (adjustToCurrentEPG())
+		return;
+	getEpgId();
 	CTimerd::RecordingInfo ri=eventInfo;
 	ri.eventID=eventID;
 	strcpy(ri.recordingDir, recordingDir.substr(0,sizeof(ri.recordingDir)-1).c_str());
@@ -1187,6 +1199,8 @@ void CTimerEvent_Record::fireEvent()
 //------------------------------------------------------------
 void CTimerEvent_Record::announceEvent()
 {
+	if (adjustToCurrentEPG())
+		return;
 	Refresh();
 	CTimerd::RecordingInfo ri=eventInfo;
 	ri.eventID=eventID;
@@ -1235,11 +1249,17 @@ void CTimerEvent_Record::saveToConfig(CConfigFile *config)
 
 	config->setString("EPG_TITLE_"+id,epgTitle);
 	dprintf("set EPG_TITLE_%s to %s (%p)\n",id.c_str(),epgTitle.c_str(), &epgTitle);
+
+	config->setInt32("RECORDING_SAFETY_"+id, recordingSafety);
+	dprintf("set RECORDING_SAFETY_%s to %d\n",id.c_str(), recordingSafety);
+
+	config->setInt32("EPG_AUTO_ADJUST_"+id, autoAdjustToEPG);
+	dprintf("set EPG_AUTO_ADJUST_TO_EPG_%s to %d\n",id.c_str(), autoAdjustToEPG);
 }
 //------------------------------------------------------------
 void CTimerEvent_Record::Reschedule()
 {
-	// clear epgId on reschedule
+	// clear epgID on reschedule
 	eventInfo.epgID = 0;
 	eventInfo.epg_starttime = 0;
 	epgTitle="";
@@ -1276,6 +1296,47 @@ void CTimerEvent_Record::Refresh()
 	if (eventInfo.epgID == 0)
 		getEpgId();
 }
+//------------------------------------------------------------
+bool CTimerEvent_Record::adjustToCurrentEPG()
+{
+	if (!autoAdjustToEPG)
+		return false;
+
+	CChannelEventList evtlist;
+	CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist);
+
+	time_t now = time(NULL);
+	CChannelEventList::iterator first = evtlist.end();
+	for (CChannelEventList::iterator e = evtlist.begin(); e != evtlist.end(); ++e)
+	{
+		if (e->startTime <  now)
+			continue;
+		if (first == evtlist.end() || first->startTime > e->startTime)
+			first = e;
+		if (alarmTime <= e->startTime && e->startTime + (int)e->duration <= stopTime)
+			return false;
+	}
+	if (first == evtlist.end())
+		return false;
+
+	time_t _announceTime = first->startTime - (alarmTime - announceTime);
+	time_t _alarmTime = first->startTime;
+	time_t _stopTime = first->startTime + first->duration;
+	if (recordingSafety) {
+		int pre, post;
+		CTimerManager::getInstance()->getRecordingSafety(pre, post);
+		_alarmTime -= pre;
+		_stopTime += post;
+	}
+
+	CTimerEvent_Record *event= new CTimerEvent_Record(_announceTime, _alarmTime, _stopTime,
+							  eventInfo.channel_id, eventInfo.epgID, first->startTime, eventInfo.apids,
+							  CTimerd::TIMERREPEAT_ONCE, 1, recordingDir, recordingSafety, autoAdjustToEPG);
+	CTimerManager::getInstance()->addEvent(event,false);
+	setState(CTimerd::TIMERSTATE_HASFINISHED);
+
+	return true;
+}
 //=============================================================
 // Zapto Event
 //=============================================================
@@ -1294,9 +1355,6 @@ void CTimerEvent_Zapto::announceEvent()
 //------------------------------------------------------------
 void CTimerEvent_Zapto::fireEvent()
 {
-	if(CTimerdClient::adzap_eventID == eventID)
-		CTimerdClient::adzap_eventID = 0;//reset adzap flag
-
 	CTimerManager::getInstance()->getEventServer()->sendEvent(CTimerdClient::EVT_ZAPTO,
 								  CEventServer::INITID_TIMERD,
 								  &eventInfo,

src/timerd/timermanager.h

@@ -117,13 +117,16 @@ class CTimerEvent_Record : public CTimerEvent
 	CTimerd::EventInfo eventInfo;
 	std::string recordingDir;
 	std::string epgTitle;
+	bool recordingSafety;
+	bool autoAdjustToEPG;
 	CTimerEvent_Record(time_t announceTime, time_t alarmTime, time_t stopTime,
 			   t_channel_id channel_id,
 			   event_id_t epgID = 0,
 			   time_t epg_starttime = 0,
 			   unsigned char apids = TIMERD_APIDS_STD,
 			   CTimerd::CTimerEventRepeat evrepeat = CTimerd::TIMERREPEAT_ONCE,
-			   uint32_t repeatcount = 1, const std::string &recDir = "");
+			   uint32_t repeatcount = 1, const std::string &recDir = "",
+			   bool _recordingSafety = true, bool _autoAdjustToEPG = true);
 	CTimerEvent_Record(CConfigFile *config, int iId);
 	virtual ~CTimerEvent_Record(){};
 	virtual CTimerd::CTimerEventTypes getEventType(void) const { return CTimerd::TIMER_RECORD; };
@@ -134,6 +137,7 @@ class CTimerEvent_Record : public CTimerEvent
 	virtual void Reschedule();
 	virtual void getEpgId();
 	virtual void Refresh();
+	virtual bool adjustToCurrentEPG();
 };
 
 class CTimerEvent_Zapto : public CTimerEvent_Record