frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

The cTimer constructor can now take an optional cChannel

Browse Source
This commit is contained in:
Klaus Schmidinger
2006-01-01 15:44:29 +01:00
parent 76e7a59f69
commit 86197f0206
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@@ -1560,6 +1560,7 @@ Nicolas Huillard <nhuillard@e-dition.fr>
Patrick Fischer <patrick_fischer@gmx.de>
for reporting an error in the cFilter example in PLUGINS.html
for making the static cControl functions thread safe
for suggesting that the cTimer constructor should take an optional cChannel
Ralf M<>ller <ralf@bj-ig.de>
for a patch that was used to implement cUnbufferedFile

2
HISTORY
View File

@@ -4063,3 +4063,5 @@ Video Disk Recorder Revision History
- Fixed incrementing the 'state' variables in the repacker classes in remux.c
to avoid warnings with g++ 4.1.0 (reported by Ville Skytt<74>).
- The Makefile now reports a summary of failed plugins (thanks to Udo Richter).
- The cTimer constructor can now take an optional cChannel (suggested by
Patrick Fischer).

6
timers.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: timers.c 1.37 2005/12/27 14:33:14 kls Exp $
* $Id: timers.c 1.38 2006/01/01 15:41:46 kls Exp $
*/
#include "timers.h"
@@ -20,14 +20,14 @@
// -- cTimer -----------------------------------------------------------------
cTimer::cTimer(bool Instant, bool Pause)
cTimer::cTimer(bool Instant, bool Pause, cChannel *Channel)
{
startTime = stopTime = 0;
recording = pending = inVpsMargin = false;
flags = tfNone;
if (Instant)
SetFlags(tfActive | tfInstant);
channel = Channels.GetByNumber(cDevice::CurrentChannel());
channel = Channel ? Channel : Channels.GetByNumber(cDevice::CurrentChannel());
time_t t = time(NULL);
struct tm tm_r;
struct tm *now = localtime_r(&t, &tm_r);

4
timers.h
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: timers.h 1.20 2005/12/27 14:27:26 kls Exp $
* $Id: timers.h 1.21 2006/01/01 15:41:26 kls Exp $
*/
#ifndef __TIMERS_H
@@ -41,7 +41,7 @@ private:
char *summary;
const cEvent *event;
public:
cTimer(bool Instant = false, bool Pause = false);
cTimer(bool Instant = false, bool Pause = false, cChannel *Channel = NULL);
cTimer(const cEvent *Event);
virtual ~cTimer();
cTimer& operator= (const cTimer &Timer);