frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

cIoThrottle::Engaged() is now also checked in cRemoveDeletedRecordingsThread::Action()

Browse Source
This commit is contained in:
Klaus Schmidinger 2012-10-03 12:58:02 +02:00
parent 90d854c0b4
commit 5a407d0e68
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1757,6 +1757,7 @@ Udo Richter <udo_richter@gmx.de>
for adding the option --outputonly to the dvbsddevice plugin for adding the option --outputonly to the dvbsddevice plugin
for adding a missing template specification to the c'tor of cSortedTimers for adding a missing template specification to the c'tor of cSortedTimers
for contributing to a patch that implements FHS support for contributing to a patch that implements FHS support
for suggesting to check cIoThrottle::Engaged() in cRemoveDeletedRecordingsThread::Action()
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

3
HISTORY
View File

@ -7277,3 +7277,6 @@ Video Disk Recorder Revision History
- Pressing the Play key during normal live viewing mode now opens the Recordings menu - Pressing the Play key during normal live viewing mode now opens the Recordings menu
if there is no "last viewed" recording (thanks to Alexander Wenzel). if there is no "last viewed" recording (thanks to Alexander Wenzel).
The same behavior has been implemented for the Blue key in the main menu. The same behavior has been implemented for the Blue key in the main menu.
- cIoThrottle::Engaged() is now also checked in cRemoveDeletedRecordingsThread::Action(),
to suspend removing deleted recordings in case this is necessary to make room for
new, ongoing recordings (suggested by 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 2.64 2012/09/30 13:05:14 kls Exp $ * $Id: recording.c 2.65 2012/10/03 12:52:13 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -97,6 +97,8 @@ void cRemoveDeletedRecordingsThread::Action(void)
bool deleted = false; bool deleted = false;
cThreadLock DeletedRecordingsLock(&DeletedRecordings); cThreadLock DeletedRecordingsLock(&DeletedRecordings);
for (cRecording *r = DeletedRecordings.First(); r; ) { for (cRecording *r = DeletedRecordings.First(); r; ) {
if (cIoThrottle::Engaged())
return;
if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) { if (r->Deleted() && time(NULL) - r->Deleted() > DELETEDLIFETIME) {
cRecording *next = DeletedRecordings.Next(r); cRecording *next = DeletedRecordings.Next(r);
r->Remove(); r->Remove();