Added status flag for timers that are currently recording

This commit is contained in:
Klaus Schmidinger 2005-05-07 11:10:56 +02:00
parent 9f7166a891
commit 8b137f8ce5
5 changed files with 14 additions and 4 deletions

View File

@ -64,6 +64,8 @@ Matthias Schniedermeyer <ms@citd.de>
for suggesting the SVDRP command CLRE for suggesting the SVDRP command CLRE
for reporting a bug in handling one-shot timers that were already recording for reporting a bug in handling one-shot timers that were already recording
and had their start time changed into the future and had their start time changed into the future
for suggesting to give the timer status a bit that is set when that timer
is currently recording
Miha Setina <mihasetina@softhome.net> Miha Setina <mihasetina@softhome.net>
for translating OSD texts to the Slovenian language for translating OSD texts to the Slovenian language

View File

@ -3474,7 +3474,7 @@ Video Disk Recorder Revision History
- Added a missing cMutexLock to cRemote::HasKeys() (thanks to Wolfgang Rohdewald). - Added a missing cMutexLock to cRemote::HasKeys() (thanks to Wolfgang Rohdewald).
- All log entries regarding timers now contain a short description of the timer. - All log entries regarding timers now contain a short description of the timer.
2005-05-05: Version 1.3.24 2005-05-07: Version 1.3.24
- Now including the optional user defined Make.config from the 'libsi' Makefile - Now including the optional user defined Make.config from the 'libsi' Makefile
(thanks to Ville Skyttä). (thanks to Ville Skyttä).
@ -3500,3 +3500,5 @@ Video Disk Recorder Revision History
this one). this one).
- Since there are several places in thread.c where a timeout value is calculated, - Since there are several places in thread.c where a timeout value is calculated,
this has been put into a separate function. this has been put into a separate function.
- The timer status now has a new bit that is set when that timer is currently
recording (suggested by Matthias Schniedermeyer). See man vdr(5) for details.

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: timers.c 1.30 2005/03/20 14:50:37 kls Exp $ * $Id: timers.c 1.31 2005/05/07 11:10:56 kls Exp $
*/ */
#include "timers.h" #include "timers.h"
@ -441,6 +441,10 @@ void cTimer::SetEvent(const cSchedule *Schedule, const cEvent *Event)
void cTimer::SetRecording(bool Recording) void cTimer::SetRecording(bool Recording)
{ {
recording = Recording; recording = Recording;
if (recording)
SetFlags(tfRecording);
else
ClrFlags(tfRecording);
isyslog("timer %s %s", *ToDescr(), recording ? "start" : "stop"); isyslog("timer %s %s", *ToDescr(), recording ? "start" : "stop");
} }

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: timers.h 1.18 2005/03/20 14:47:45 kls Exp $ * $Id: timers.h 1.19 2005/05/07 10:36:35 kls Exp $
*/ */
#ifndef __TIMERS_H #ifndef __TIMERS_H
@ -19,6 +19,7 @@ enum eTimerFlags { tfNone = 0x0000,
tfActive = 0x0001, tfActive = 0x0001,
tfInstant = 0x0002, tfInstant = 0x0002,
tfVps = 0x0004, tfVps = 0x0004,
tfRecording = 0x0008,
tfAll = 0xFFFF, tfAll = 0xFFFF,
}; };
enum eTimerMatch { tmNone, tmPartial, tmFull }; enum eTimerMatch { tmNone, tmPartial, tmFull };

3
vdr.5
View File

@ -8,7 +8,7 @@
.\" License as specified in the file COPYING that comes with the .\" License as specified in the file COPYING that comes with the
.\" vdr distribution. .\" vdr distribution.
.\" .\"
.\" $Id: vdr.5 1.35 2005/03/19 15:20:47 kls Exp $ .\" $Id: vdr.5 1.36 2005/05/07 10:40:23 kls Exp $
.\" .\"
.TH vdr 5 "19 Mar 2005" "1.3.23" "Video Disk Recorder Files" .TH vdr 5 "19 Mar 2005" "1.3.23" "Video Disk Recorder Files"
.SH NAME .SH NAME
@ -210,6 +210,7 @@ l l.
\fB1\fR@the timer is active (and will record if it hits) \fB1\fR@the timer is active (and will record if it hits)
\fB2\fR@this is an instant recording timer \fB2\fR@this is an instant recording timer
\fB4\fR@this timer uses VPS \fB4\fR@this timer uses VPS
\fB8\fR@this timer is currently recording (may only be up-to-date with SVDRP)
.TE .TE
Bits other than these can be used by external programs to mark active timers Bits other than these can be used by external programs to mark active timers
and recognize if the user has modified them. When a user modifies an active and recognize if the user has modified them. When a user modifies an active