summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-04-27 15:56:04 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2003-04-27 15:56:04 +0200
commit249a4ab95914fd00601915354d8aabf75da1e064 (patch)
tree72ffe0a0f96afbf4a66a56229647e9ae2c78da73
parenta804b990fe9541b2553dba4be4efab620a94e991 (diff)
downloadvdr-249a4ab95914fd00601915354d8aabf75da1e064.tar.gz
vdr-249a4ab95914fd00601915354d8aabf75da1e064.tar.bz2
Fixed minimum lifespan of deleted recordings
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY4
-rw-r--r--config.h4
-rw-r--r--recording.c4
4 files changed, 9 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 37394db7..da6aaef6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -495,6 +495,7 @@ Jaakko Hyvätti <jaakko@hyvatti.iki.fi>
for adding a check if there is a connection to the keyboard
for fixing recording overlapping timers on the same channel in case
DO_REC_AND_PLAY_ON_PRIMARY_DEVICE and/or DO_MULTIPLE_RECORDINGS is not defined
+ for fixing the minimum lifespan of deleted recordings
Dennis Noordsij <dennis.noordsij@wiral.com>
for reporting a small glitch when switching channels
diff --git a/HISTORY b/HISTORY
index 16c74474..697128fe 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2084,3 +2084,7 @@ Video Disk Recorder Revision History
- The new SVDRP command STAT can be used to request information about the disk
usage (thanks to Thomas Koch).
- Fixed faulty calculation of section length in eit.c (thanks to Teemu Rantanen).
+
+2003-04-27: Version 1.1.30
+
+- Fixed minimum lifespan of deleted recordings (thanks to Jaakko Hyvätti).
diff --git a/config.h b/config.h
index e56689fc..343ed15f 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 1.154 2003/04/21 16:23:15 kls Exp $
+ * $Id: config.h 1.155 2003/04/27 15:56:04 kls Exp $
*/
#ifndef __CONFIG_H
@@ -19,7 +19,7 @@
#include "device.h"
#include "tools.h"
-#define VDRVERSION "1.1.29"
+#define VDRVERSION "1.1.30"
#define MAXPRIORITY 99
#define MAXLIFETIME 99
diff --git a/recording.c b/recording.c
index 261bee8b..23521a61 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: recording.c 1.75 2003/04/12 09:51:44 kls Exp $
+ * $Id: recording.c 1.76 2003/04/27 15:52:17 kls Exp $
*/
#include "recording.h"
@@ -78,7 +78,7 @@ void RemoveDeletedRecordings(void)
r0 = r;
r = Recordings.Next(r);
}
- if (r0 && time(NULL) - r0->start > DELETEDLIFETIME * 60) {
+ if (r0 && time(NULL) - r0->start > DELETEDLIFETIME * 3600) {
r0->Remove();
RemoveEmptyVideoDirectories();
LastRemoveCheck += REMOVELATENCY;