Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-01 22:53:51 +01:00
Code Issues Projects Releases Wiki Activity

2021-10-28 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored the 'RDTimeEngine::StartEvent()' method to account for
	Daylight Saving Time transitions properly.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-10-29 11:56:51 -04:00
parent ca60833fed
commit 3a102c03e6
3 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -22562,3 +22562,6 @@
* Fixed a bug in the 'Edit Audio' dialog in rdlibrary(1) that * Fixed a bug in the 'Edit Audio' dialog in rdlibrary(1) that
would set the initial position of a newly-added marker off-screen would set the initial position of a newly-added marker off-screen
when the waveform view port was scrolled to the right. when the waveform view port was scrolled to the right.
2021-10-28 Fred Gleason <fredg@paravelsystems.com>
* Refactored the 'RDTimeEngine::StartEvent()' method to account for
Daylight Saving Time transitions properly.

65
lib/rdtimeengine.cpp
View File

@@ -84,12 +84,67 @@ void RDTimeEngine::timerData(int id)
void RDTimeEngine::StartEvent(int id) void RDTimeEngine::StartEvent(int id)
{ {
QTime now=QTime::currentTime(); //
int interval=now.msecsTo(d_times.value(id)); // Maintainer's Note
//
// In order to account for Daylight Saving Time (DST) transitions properly,
// calculations for the timer interval *must* be done using QDateTime,
// *not* QTime!
//
// See the Qt documentation for the QDateTime and QTimeZone classes for
// discussion of DST and its implications.
//
QDateTime now=QDateTime::currentDateTime();
QDateTime then=QDateTime(now.date(),d_times.value(id));
if(interval<0) { // Crosses midnight if((now.time()>d_times.value(id))||(!then.isValid())) {
interval= //
now.msecsTo(QTime(23,59,59))+1000+QTime(0,0,0).msecsTo(d_times.value(id)); // Ensure that the advanced date/time is valid, in case we land on a
// "non-existent" date/time --e.g. during a DST "spring forward"
// transition.
//
do {
then.setDate(then.date().addDays(1));
}
while(!then.isValid());
} }
int interval=now.msecsTo(then);
d_timers.value(id)->start(1+interval); d_timers.value(id)->start(1+interval);
/*
printf("ID %d set interval %d mS [%s] for scheduled time %s\n",id,interval,
QTime(0,0,0).addMSecs(interval).toString("hh:mm:ss.zzz").toUtf8().constData(),
d_times.value(id).toString("hh:mm:ss.zzz").toUtf8().constData());
*/
}
void RDTimeEngine::DumpTimeZone(const QTimeZone &tz) const
{
QTimeZone::OffsetData offset;
printf("id: %s\n",tz.id().constData());
printf("isValid: %u\n",tz.isValid());
printf("hasTransitions: %u\n",tz.hasTransitions());
if(tz.hasTransitions()) {
offset=tz.nextTransition(QDateTime::currentDateTime());
if(offset.atUtc.isValid()) {
printf(" next ");
DumpTransition(offset);
}
offset=tz.previousTransition(QDateTime::currentDateTime());
if(offset.atUtc.isValid()) {
printf(" previous ");
DumpTransition(offset);
}
}
}
void RDTimeEngine::DumpTransition(QTimeZone::OffsetData offset) const
{
printf("transition: %s UTC\n",offset.atUtc.toString("yyyy-MM-ddThh:mm:ss.zzz").toUtf8().constData());
printf(" offsetFromUtc: %d secs\n",offset.offsetFromUtc);
printf(" standardTimeOffset: %d secs\n",offset.standardTimeOffset);
printf(" daylightTimeOffset: %d secs\n",offset.daylightTimeOffset);
printf(" abbreviation: %s\n",offset.abbreviation.toUtf8().constData());
} }

5
lib/rdtimeengine.h
View File

@@ -1,6 +1,6 @@
// rdtimeengine.h // rdtimeengine.h
// //
// An event timer engine. // Event timer engine.
// //
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// //
@@ -26,6 +26,7 @@
#include <QObject> #include <QObject>
#include <QSignalMapper> #include <QSignalMapper>
#include <QTimer> #include <QTimer>
#include <QTimeZone>
class RDTimeEngine : public QObject class RDTimeEngine : public QObject
{ {
@@ -46,6 +47,8 @@ class RDTimeEngine : public QObject
private: private:
void StartEvent(int id); void StartEvent(int id);
void DumpTimeZone(const QTimeZone &tz) const;
void DumpTransition(QTimeZone::OffsetData offset) const;
QMap<int,QTime> d_times; QMap<int,QTime> d_times;
QMap<int,QTimer *> d_timers; QMap<int,QTimer *> d_timers;
QSignalMapper *d_mapper; QSignalMapper *d_mapper;