mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed calculating the start time of repeated timers with "first day"
This commit is contained in:
parent
2e01178e54
commit
6496d879e5
@ -1431,6 +1431,7 @@ Udo Richter <udo_richter@gmx.de>
|
|||||||
for suggesting to add 'eval' to the $VDRCMD call in 'runvdr' to avoid problems with
|
for suggesting to add 'eval' to the $VDRCMD call in 'runvdr' to avoid problems with
|
||||||
quoting
|
quoting
|
||||||
for fixing handling the "Power" key in case a timer is about to start recording
|
for fixing handling the "Power" key in case a timer is about to start recording
|
||||||
|
for fixing calculating the start time of repeated timers with "first day"
|
||||||
|
|
||||||
Sven Kreiensen <svenk@kammer.uni-hannover.de>
|
Sven Kreiensen <svenk@kammer.uni-hannover.de>
|
||||||
for his help in keeping 'channels.conf.terr' up to date
|
for his help in keeping 'channels.conf.terr' up to date
|
||||||
|
2
HISTORY
2
HISTORY
@ -4727,3 +4727,5 @@ Video Disk Recorder Revision History
|
|||||||
be removed once the API version actually needs to be incremented.
|
be removed once the API version actually needs to be incremented.
|
||||||
- Fixed deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD() (thanks
|
- Fixed deleting the 'skinDescriptions' in cMenuSetupOSD::~cMenuSetupOSD() (thanks
|
||||||
to Tobias Grimm).
|
to Tobias Grimm).
|
||||||
|
- Fixed calculating the start time of repeated timers with "first day" (thanks to
|
||||||
|
Udo Richter).
|
||||||
|
6
timers.c
6
timers.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: timers.c 1.59 2006/05/07 09:01:00 kls Exp $
|
* $Id: timers.c 1.60 2006/05/25 12:32:11 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "timers.h"
|
#include "timers.h"
|
||||||
@ -347,7 +347,7 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
for (int i = -1; i <= 7; i++) {
|
for (int i = -1; i <= 7; i++) {
|
||||||
time_t t0 = IncDay(t, i);
|
time_t t0 = IncDay(day ? max(day, t) : t, i);
|
||||||
if (DayMatches(t0)) {
|
if (DayMatches(t0)) {
|
||||||
time_t a = SetTime(t0, begin);
|
time_t a = SetTime(t0, begin);
|
||||||
time_t b = a + length;
|
time_t b = a + length;
|
||||||
@ -359,7 +359,7 @@ bool cTimer::Matches(time_t t, bool Directly, int Margin) const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!startTime)
|
if (!startTime)
|
||||||
startTime = day; // just to have something that's more than a week in the future
|
startTime = IncDay(t, 7); // just to have something that's more than a week in the future
|
||||||
else if (!Directly && (t > startTime || t > day + SECSINDAY + 3600)) // +3600 in case of DST change
|
else if (!Directly && (t > startTime || t > day + SECSINDAY + 3600)) // +3600 in case of DST change
|
||||||
day = 0;
|
day = 0;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user