summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY5
-rw-r--r--config.h10
-rw-r--r--recording.c13
4 files changed, 15 insertions, 15 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 15a605e3..63b164a6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1069,6 +1069,8 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
for setting the thread name, so that it can be seen in 'top -H'
for replacing the Finnish language code "smi" with "suo"
for adding cap_sys_nice to the capabilities that are not dropped
+ for making VDR no longer check for deleted recordings to be removed from the
+ foreground thread, to avoid blocking the main loop for too long
Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index 086c92af..d5712866 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6030,3 +6030,8 @@ Video Disk Recorder Revision History
- No longer writing the video type into channels.conf if VPID is 0 (thanks to
Oliver Endriss for reporting this).
- Improved efficiency of cEIT::cEIT() (thanks to Tobias Bratfisch).
+
+2009-04-12: Version 1.7.6
+
+- No longer checking for deleted recordings to be removed from the foreground
+ thread, to avoid blocking the main loop for too long (thanks to Rolf Ahrenberg).
diff --git a/config.h b/config.h
index 6e15ba4a..8dae4563 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 2.7 2009/01/30 16:05:34 kls Exp $
+ * $Id: config.h 2.8 2009/04/12 14:20:52 kls Exp $
*/
#ifndef __CONFIG_H
@@ -22,13 +22,13 @@
// VDR's own version number:
-#define VDRVERSION "1.7.5"
-#define VDRVERSNUM 10705 // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION "1.7.6"
+#define VDRVERSNUM 10706 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number:
-#define APIVERSION "1.7.5"
-#define APIVERSNUM 10705 // Version * 10000 + Major * 100 + Minor
+#define APIVERSION "1.7.6"
+#define APIVERSNUM 10706 // Version * 10000 + Major * 100 + Minor
// When loading plugins, VDR searches them by their APIVERSION, which
// may be smaller than VDRVERSION in case there have been no changes to
diff --git a/recording.c b/recording.c
index 2b44b1a4..22df5b6c 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 2.9 2009/01/30 16:27:19 kls Exp $
+ * $Id: recording.c 2.10 2009/04/12 14:04:22 kls Exp $
*/
#include "recording.h"
@@ -114,15 +114,8 @@ void RemoveDeletedRecordings(void)
{
static time_t LastRemoveCheck = 0;
if (time(NULL) - LastRemoveCheck > REMOVECHECKDELTA) {
- if (!RemoveDeletedRecordingsThread.Active()) {
- cThreadLock DeletedRecordingsLock(&DeletedRecordings);
- for (cRecording *r = DeletedRecordings.First(); r; r = DeletedRecordings.Next(r)) {
- if (r->deleted && time(NULL) - r->deleted > DELETEDLIFETIME) {
- RemoveDeletedRecordingsThread.Start();
- break;
- }
- }
- }
+ if (!RemoveDeletedRecordingsThread.Active())
+ RemoveDeletedRecordingsThread.Start();
LastRemoveCheck = time(NULL);
}
}