frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed setting system time to avoid time jumps in case of faulty data

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-08-07 13:52:29 +02:00
parent 1173d8d359
commit 5da7f10c3e
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -469,6 +469,7 @@ Oliver Lorei <oliverlorei@cityweb.de>
Andreas Böttger <fboettger@t-online.de> Andreas Böttger <fboettger@t-online.de>
for reporting a bug in skipping forward in time shift mode near the end of the recording for reporting a bug in skipping forward in time shift mode near the end of the recording
for fixing setting system time to avoid time jumps in case of faulty data
Onno Kreuzinger <ok@solutas.net> Onno Kreuzinger <ok@solutas.net>
for reporting leftover references to the file FORMATS in MANUAL and svdrp.c for reporting leftover references to the file FORMATS in MANUAL and svdrp.c

2
HISTORY
View File

@ -3668,3 +3668,5 @@ Video Disk Recorder Revision History
a forced EPG scan works even if EPG scan timeout is set to 0 (thanks to a forced EPG scan works even if EPG scan timeout is set to 0 (thanks to
Bernhard Stegmaier for reporting a problem with this). Bernhard Stegmaier for reporting a problem with this).
- Fixed cDvbSpuBitmap::putPixel() (thanks to Reinhard Nissl). - Fixed cDvbSpuBitmap::putPixel() (thanks to Reinhard Nissl).
- Fixed setting system time to avoid time jumps in case of faulty data (thanks
to Andreas Böttger).

18
eit.c
View File

@ -8,7 +8,7 @@
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
* Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>. * Adapted to 'libsi' for VDR 1.3.0 by Marcel Wiesweg <marcel.wiesweg@gmx.de>.
* *
* $Id: eit.c 1.108 2005/06/11 15:31:21 kls Exp $ * $Id: eit.c 1.109 2005/08/07 13:52:29 kls Exp $
*/ */
#include "eit.h" #include "eit.h"
@ -252,11 +252,13 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data)
class cTDT : public SI::TDT { class cTDT : public SI::TDT {
private: private:
static cMutex mutex; static cMutex mutex;
static int lastDiff;
public: public:
cTDT(const u_char *Data); cTDT(const u_char *Data);
}; };
cMutex cTDT::mutex; cMutex cTDT::mutex;
int cTDT::lastDiff = 0;
cTDT::cTDT(const u_char *Data) cTDT::cTDT(const u_char *Data)
:SI::TDT(Data, false) :SI::TDT(Data, false)
@ -266,12 +268,16 @@ cTDT::cTDT(const u_char *Data)
time_t sattim = getTime(); time_t sattim = getTime();
time_t loctim = time(NULL); time_t loctim = time(NULL);
if (abs(sattim - loctim) > 2) { int diff = abs(sattim - loctim);
if (diff > 2) {
mutex.Lock(); mutex.Lock();
isyslog("System Time = %s (%ld)\n", *TimeToString(loctim), loctim); if (abs(diff - lastDiff) < 3) {
isyslog("Local Time = %s (%ld)\n", *TimeToString(sattim), sattim); isyslog("System Time = %s (%ld)\n", *TimeToString(loctim), loctim);
if (stime(&sattim) < 0) isyslog("Local Time = %s (%ld)\n", *TimeToString(sattim), sattim);
esyslog("ERROR while setting system time: %m"); if (stime(&sattim) < 0)
esyslog("ERROR while setting system time: %m");
}
lastDiff = diff;
mutex.Unlock(); mutex.Unlock();
} }
} }