X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/358845c0c1b60f79831ee81ccf55c7c5f5d771e3..99e6feec1546d5fa2ff8e5cdfdf84438db4281b3:/lib/dvb/dvbtime.cpp

diff --git a/lib/dvb/dvbtime.cpp b/lib/dvb/dvbtime.cpp
index 3bd0a78d..7684bfa4 100644
--- a/lib/dvb/dvbtime.cpp
+++ b/lib/dvb/dvbtime.cpp
@@ -76,7 +76,7 @@ void TDT::ready(int error)
 	eDVBLocalTimeHandler::getInstance()->updateTime(error, chan, ++update_count);
 }
 
-int TDT::createTable(int nr, const __u8 *data, unsigned int max)
+int TDT::createTable(unsigned int nr, const __u8 *data, unsigned int max)
 {
 	if ( data && data[0] == 0x70 || data[0] == 0x73 )
 	{
@@ -84,7 +84,8 @@ int TDT::createTable(int nr, const __u8 *data, unsigned int max)
 		if ( length >= 5 )
 		{
 			time_t tptime = parseDVBtime(data[3], data[4], data[5], data[6], data[7]);
-			eDVBLocalTimeHandler::getInstance()->updateTime(tptime, chan, update_count);
+			if (tptime && tptime != -1)
+				eDVBLocalTimeHandler::getInstance()->updateTime(tptime, chan, update_count);
 			error=0;
 			return 1;
 		}
@@ -128,7 +129,18 @@ eDVBLocalTimeHandler::eDVBLocalTimeHandler()
 	if (!res_mgr)
 		eDebug("[eDVBLocalTimerHandler] no resource manager !!!!!!!");
 	else
+	{
 		res_mgr->connectChannelAdded(slot(*this,&eDVBLocalTimeHandler::DVBChannelAdded), m_chanAddedConn);
+		time_t now = time(0);
+		if ( now < 1072224000 ) // 01.01.2004
+			eDebug("RTC not ready... wait for transponder time");
+		else // inform all who's waiting for valid system time..
+		{
+			eDebug("Use valid Linux Time :) (RTC?)");
+			m_time_ready = true;
+			/*emit*/ m_timeUpdated();
+		}
+	}
 }
 
 eDVBLocalTimeHandler::~eDVBLocalTimeHandler()
@@ -136,6 +148,11 @@ eDVBLocalTimeHandler::~eDVBLocalTimeHandler()
 	instance=0;
 	for (std::map<iDVBChannel*, channel_data>::iterator it=m_knownChannels.begin(); it != m_knownChannels.end(); ++it)
 		delete it->second.tdt;
+	if (ready())
+	{
+		eDebug("set RTC to previous valid time");
+		setRTC(nowTime());
+	}
 }
 
 void eDVBLocalTimeHandler::readTimeOffsetData( const char* filename )
@@ -189,20 +206,21 @@ void eDVBLocalTimeHandler::updateTime( time_t tp_time, eDVBChannel *chan, int up
 			time_t rtc_time = getRTC();
 			if ( rtc_time ) // RTC Ready?
 			{
-				tm now = *localtime(&rtc_time);
+				tm now;
+				localtime_r(&rtc_time, &now);
 				eDebug("[eDVBLocalTimerHandler] RTC time is %02d:%02d:%02d",
 					now.tm_hour,
 					now.tm_min,
 					now.tm_sec);
 				time_t linuxTime=time(0);
 				time_t nowTime=linuxTime+m_time_difference;
-				now = *localtime(&nowTime);
+				localtime_r(&nowTime, &now);
 				eDebug("[eDVBLocalTimerHandler] Receiver time is %02d:%02d:%02d",
 					now.tm_hour,
 					now.tm_min,
 					now.tm_sec);
 				m_time_difference = rtc_time - linuxTime;
-				eDebug("[eDVBLocalTimerHandler] RTC to Receiver time difference is %d seconds", nowTime - rtc_time );
+				eDebug("[eDVBLocalTimerHandler] RTC to Receiver time difference is %ld seconds", nowTime - rtc_time );
 				if ( abs(m_time_difference) > 59 )
 				{
 					eDebug("[eDVBLocalTimerHandler] set Linux Time to RTC Time");
@@ -268,7 +286,7 @@ void eDVBLocalTimeHandler::updateTime( time_t tp_time, eDVBChannel *chan, int up
 					time_t rtc=getRTC();
 					m_timeOffsetMap[chan->getChannelID()] = rtc-tp_time;
 					new_diff = rtc-nowTime;  // set enigma time to rtc
-					eDebug("[eDVBLocalTimerHandler] update stored correction to %d (calced against RTC time)", rtc-tp_time );
+					eDebug("[eDVBLocalTimerHandler] update stored correction to %ld (calced against RTC time)", rtc-tp_time );
 				}
 				else if ( abs(ddiff) <= 120 )
 				{
@@ -313,7 +331,8 @@ void eDVBLocalTimeHandler::updateTime( time_t tp_time, eDVBChannel *chan, int up
 			return;
 		}
 
-		tm now = *localtime(&t);
+		tm now;
+		localtime_r(&t, &now);
 		eDebug("[eDVBLocalTimerHandler] time update to %02d:%02d:%02d",
 			now.tm_hour,
 			now.tm_min,