frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed handling lifetime when deciding whether to delete a recording

This commit is contained in:
Klaus Schmidinger 2005-05-06 14:00:45 +02:00
parent b3c1f1bb73
commit 6ca56047ae
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1207,6 +1207,7 @@ Milos Kapoun <m.kapoun@cra.cz>
Udo Richter <udo_richter@gmx.de> Udo Richter <udo_richter@gmx.de>
for refining the formula for making volume control more linear for refining the formula for making volume control more linear
for fixing handling lifetime when deciding whether to delete a recording
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
View File

@ -3494,3 +3494,5 @@ Video Disk Recorder Revision History
- When reading the channels.conf file, duplicate channels (i.e. ones that have - When reading the channels.conf file, duplicate channels (i.e. ones that have
the same channel ID) are now automatically deleted and only the first one is the same channel ID) are now automatically deleted and only the first one is
actually stored. actually stored.
- Fixed handling lifetime when deciding whether to delete a recording (thanks to
Udo Richter).

4
recording.c
View File

@ -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: recording.c 1.96 2005/02/12 10:17:47 kls Exp $ * $Id: recording.c 1.97 2005/05/06 14:00:23 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -126,7 +126,7 @@ void AssertFreeDiskSpace(int Priority)
while (r) { while (r) {
if (!r->IsEdited() && r->lifetime < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever if (!r->IsEdited() && r->lifetime < MAXLIFETIME) { // edited recordings and recordings with MAXLIFETIME live forever
if ((r->lifetime == 0 && Priority > r->priority) || // the recording has no guaranteed lifetime and the new recording has higher priority if ((r->lifetime == 0 && Priority > r->priority) || // the recording has no guaranteed lifetime and the new recording has higher priority
(time(NULL) - r->start) / SECSINDAY > r->lifetime) { // the recording's guaranteed lifetime has expired (r->lifetime > 0 && (time(NULL) - r->start) / SECSINDAY >= r->lifetime)) { // the recording's guaranteed lifetime has expired
if (r0) { if (r0) {
if (r->priority < r0->priority || (r->priority == r0->priority && r->start < r0->start)) if (r->priority < r0->priority || (r->priority == r0->priority && r->start < r0->start))
r0 = r; // in any case we delete the one with the lowest priority (or the older one in case of equal priorities) r0 = r; // in any case we delete the one with the lowest priority (or the older one in case of equal priorities)