Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-05 16:20:14 +01:00
Code Issues Projects Releases Wiki Activity

2021-07-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored the 'RDTimeEngine' class.
	* Added a 'timeengine_test' test harness.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-07-14 16:03:55 -04:00
parent 2db1d6dda7
commit 600aef26dd
7 changed files with 222 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
lib/rdtimeengine.cpp
View File

@@ -18,159 +18,78 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <stdlib.h>
#include <rdtimeengine.h>
#include "rdtimeengine.h"
RDTimeEngine::RDTimeEngine(QObject *parent)
: QObject(parent)
{
engine_pending_id=-1;
engine_timer=new QTimer(this);
engine_timer->setSingleShot(true);
engine_time_offset=0;
connect(engine_timer,SIGNAL(timeout()),this,SLOT(timerData()));
d_mapper=new QSignalMapper(this);
connect(d_mapper,SIGNAL(mapped(int)),this,SLOT(timerData(int)));
}
RDTimeEngine::~RDTimeEngine()
{
clear();
delete engine_timer;
delete d_mapper;
}
void RDTimeEngine::clear()
{
engine_time_offset=0;
engine_events.clear();
SetTimer();
for(QMap<int,QTimer *>::const_iterator it=d_timers.begin();
it!=d_timers.end();it++) {
d_mapper->removeMappings(it.value());
delete it.value();
}
d_timers.clear();
d_times.clear();
}
QTime RDTimeEngine::event(int id) const
{
for(unsigned i=0;i<engine_events.size();i++) {
for(int j=0;j<engine_events[i].size();j++) {
if(id==engine_events[i].id(j)) {
return engine_events[i].time();
}
}
}
return QTime();
return d_times.value(id);
}
int RDTimeEngine::timeOffset() const
void RDTimeEngine::addEvent(int id,const QTime &time)
{
return engine_time_offset;
}
void RDTimeEngine::setTimeOffset(int msecs)
{
engine_time_offset=msecs;
SetTimer();
}
void RDTimeEngine::addEvent(int id,QTime time)
{
for(unsigned i=0;i<engine_events.size();i++) {
if(time==engine_events[i].time()) {
engine_events[i].addId(id);
SetTimer();
return;
}
}
engine_events.push_back(RDTimeEvent());
engine_events.back().setTime(time);
engine_events.back().addId(id);
SetTimer();
d_times[id]=time;
d_timers[id]=new QTimer(this);
d_timers.value(id)->setTimerType(Qt::PreciseTimer);
d_timers.value(id)->setSingleShot(true);
d_mapper->setMapping(d_timers.value(id),id);
connect(d_timers.value(id),SIGNAL(timeout()),d_mapper,SLOT(map()));
StartEvent(id);
}
void RDTimeEngine::removeEvent(int id)
{
for(unsigned i=0;i<engine_events.size();i++) {
for(int j=0;j<engine_events[i].size();j++) {
if(id==engine_events[i].id(j)) {
if(engine_events[i].size()==1) {
std::vector<RDTimeEvent>::iterator it=engine_events.begin()+i;
engine_events.erase(it,it+1);
}
else {
engine_events[i].removeId(j);
}
SetTimer();
return;
}
}
}
d_timers.value(id)->stop();
d_mapper->removeMappings(d_timers.value(id));
delete d_timers.value(id);
d_timers.remove(id);
d_times.remove(id);
}
int RDTimeEngine::next() const
void RDTimeEngine::timerData(int id)
{
return engine_pending_id;
emit timeout(id);
StartEvent(id);
}
void RDTimeEngine::timerData()
void RDTimeEngine::StartEvent(int id)
{
for(unsigned i=0;i<engine_events.size();i++) {
for(int j=0;j<engine_events[i].size();j++) {
if(engine_pending_id==engine_events[i].id(j)) {
EmitEvents(i);
SetTimer();
return;
}
}
QTime now=QTime::currentTime();
int interval=now.msecsTo(d_times.value(id));
if(interval<0) { // Crosses midnight
interval=
now.msecsTo(QTime(23,59,59))+1000+QTime(0,0,0).msecsTo(d_times.value(id));
}
}
void RDTimeEngine::EmitEvents(int offset)
{
// for(int i=0;i<engine_events[offset].size();i++) {
for(int i=engine_events[offset].size()-1;i>=0;i--) {
emit timeout(engine_events[offset].id(i));
}
}
void RDTimeEngine::SetTimer()
{
engine_timer->stop();
if(engine_events.size()==0) {
return;
}
QTime current_time=QTime::currentTime().addMSecs(engine_time_offset);
int diff=GetNextDiff(current_time,&engine_pending_id);
if(diff!=86400001) {
engine_timer->start(diff);
return;
}
diff=GetNextDiff(QTime(0,0,0),&engine_pending_id);
if(diff!=86400001) {
diff+=(current_time.msecsTo(QTime(23,59,59))+1000);
engine_timer->start(diff);
return;
}
}
int RDTimeEngine::GetNextDiff(QTime time,int *pending_id)
{
int diff=86400001;
*pending_id=-1;
for(unsigned i=0;i<engine_events.size();i++) {
if(((time.msecsTo(engine_events[i].time()))>=0)&&
(time.msecsTo(engine_events[i].time())<diff)) {
diff=time.msecsTo(engine_events[i].time());
*pending_id=engine_events[i].id(0);
}
}
return diff;
d_timers.value(id)->start(1+interval);
}

30
lib/rdtimeengine.h
View File

@@ -2,7 +2,7 @@
//
// An event timer engine.
//
// (C) Copyright 2002,2016 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU Library General Public License
@@ -21,11 +21,11 @@
#ifndef RDTIMEENGINE_H
#define RDTIMEENGINE_H
#include <vector>
#include <qwidget.h>
#include <qdatetime.h>
#include <qtimer.h>
#include <QDateTime>
#include <QMap>
#include <QObject>
#include <QSignalMapper>
#include <QTimer>
#include <rdtimeevent.h>
@@ -37,26 +37,20 @@ class RDTimeEngine : public QObject
~RDTimeEngine();
void clear();
QTime event(int id) const;
int timeOffset() const;
void setTimeOffset(int msecs);
void addEvent(int id,QTime time);
void addEvent(int id,const QTime &time);
void removeEvent(int id);
int next() const;
signals:
void timeout(int id);
private slots:
void timerData();
void timerData(int id);
private:
void EmitEvents(int offset);
void SetTimer();
int GetNextDiff(QTime time,int *pending_id);
QTimer *engine_timer;
std::vector<RDTimeEvent> engine_events;
int engine_pending_id;
int engine_time_offset;
void StartEvent(int id);
QMap<int,QTime> d_times;
QMap<int,QTimer *> d_timers;
QSignalMapper *d_mapper;
};