X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3ace8a7fd957857348ee785ec0857a4bd3dfed98..c5bb99fa2019da12a8fbaa1766189af520b9e79a:/lib/dvb/dvbtime.cpp

diff --git a/lib/dvb/dvbtime.cpp b/lib/dvb/dvbtime.cpp
index 89650f25..a6830dc0 100644
--- a/lib/dvb/dvbtime.cpp
+++ b/lib/dvb/dvbtime.cpp
@@ -20,7 +20,7 @@ void setRTC(time_t time)
 	FILE *f = fopen("/proc/stb/fp/rtc", "w");
 	if (f)
 	{
-		if (fprintf(f, "%u", time))
+		if (fprintf(f, "%u", (unsigned int)time))
 			prev_time = time;
 		else
 			eDebug("write /proc/stb/fp/rtc failed (%m)");
@@ -47,8 +47,11 @@ time_t getRTC()
 	if (f)
 	{
 		// sanity check to detect corrupt atmel firmware
-		if (fscanf(f, "%u", &rtc_time) != 1)
+		unsigned int tmp;
+		if (fscanf(f, "%u", &tmp) != 1)
 			eDebug("read /proc/stb/fp/rtc failed (%m)");
+		else
+			rtc_time=tmp;
 		fclose(f);
 	}
 	else
@@ -145,7 +148,7 @@ eDVBLocalTimeHandler *eDVBLocalTimeHandler::instance;
 DEFINE_REF(eDVBLocalTimeHandler);
 
 eDVBLocalTimeHandler::eDVBLocalTimeHandler()
-	:m_updateNonTunedTimer(eTimer::create(eApp)), m_time_ready(false)
+	:m_use_dvb_time(false), m_updateNonTunedTimer(eTimer::create(eApp)), m_time_ready(false)
 {
 	if ( !instance )
 		instance=this;
@@ -214,6 +217,33 @@ void eDVBLocalTimeHandler::writeTimeOffsetData( const char* filename )
 	}
 }
 
+void eDVBLocalTimeHandler::setUseDVBTime(bool b)
+{
+	if (m_use_dvb_time != b) {
+		if (m_use_dvb_time) {
+			eDebug("[eDVBLocalTimeHandler] disable sync local time with transponder time!");
+			std::map<iDVBChannel*, channel_data>::iterator it =
+				m_knownChannels.begin();
+			for (; it != m_knownChannels.end(); ++it) {
+				if (it->second.m_prevChannelState == iDVBChannel::state_ok)
+					it->second.tdt = 0;
+			}
+		}
+		else {
+			eDebug("[eDVBLocalTimeHandler] enable sync local time with transponder time!");
+			std::map<iDVBChannel*, channel_data>::iterator it =
+				m_knownChannels.begin();
+			for (; it != m_knownChannels.end(); ++it) {
+				if (it->second.m_prevChannelState == iDVBChannel::state_ok) {
+					it->second.tdt = new TDT(it->second.channel);
+					it->second.tdt->start();
+				}
+			}
+		}
+		m_use_dvb_time = b;
+	}
+}
+
 void eDVBLocalTimeHandler::updateNonTuned()
 {
 	updateTime(-1, 0, 0);
@@ -440,8 +470,10 @@ void eDVBLocalTimeHandler::DVBChannelStateChanged(iDVBChannel *chan)
 				case iDVBChannel::state_ok:
 					eDebug("[eDVBLocalTimerHandler] channel %p running", chan);
 					m_updateNonTunedTimer->stop();
-					it->second.tdt = new TDT(it->second.channel);
-					it->second.tdt->start();
+					if (m_use_dvb_time) {
+						it->second.tdt = new TDT(it->second.channel);
+						it->second.tdt->start();
+					}
 					break;
 				case iDVBChannel::state_release:
 					eDebug("[eDVBLocalTimerHandler] remove channel %p", chan);