mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Changed the return value of cTimer::SetFile() to 'void'
This commit is contained in:
parent
f6cdae50ef
commit
1f22931a77
1
HISTORY
1
HISTORY
@ -6898,3 +6898,4 @@ Video Disk Recorder Revision History
|
|||||||
- Fixed getting the subsystem ids of DVB devices in case they have been rearranged
|
- Fixed getting the subsystem ids of DVB devices in case they have been rearranged
|
||||||
via udev rules.
|
via udev rules.
|
||||||
- Added several cTimer::Set...() functions (suggested by Alexander Rieger).
|
- Added several cTimer::Set...() functions (suggested by Alexander Rieger).
|
||||||
|
- Changed the return value of cTimer::SetFile() to 'void'.
|
||||||
|
5
timers.c
5
timers.c
@ -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 2.6 2012/02/20 15:37:01 kls Exp $
|
* $Id: timers.c 2.7 2012/02/20 15:51:55 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "timers.h"
|
#include "timers.h"
|
||||||
@ -384,11 +384,10 @@ time_t cTimer::SetTime(time_t t, int SecondsFromMidnight)
|
|||||||
return mktime(&tm);
|
return mktime(&tm);
|
||||||
}
|
}
|
||||||
|
|
||||||
char *cTimer::SetFile(const char *File)
|
void cTimer::SetFile(const char *File)
|
||||||
{
|
{
|
||||||
if (!isempty(File))
|
if (!isempty(File))
|
||||||
Utf8Strn0Cpy(file, File, sizeof(file));
|
Utf8Strn0Cpy(file, File, sizeof(file));
|
||||||
return file;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cTimer::Matches(time_t t, bool Directly, int Margin) const
|
bool cTimer::Matches(time_t t, bool Directly, int Margin) const
|
||||||
|
4
timers.h
4
timers.h
@ -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 2.2 2012/02/20 15:24:28 kls Exp $
|
* $Id: timers.h 2.3 2012/02/20 15:52:57 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __TIMERS_H
|
#ifndef __TIMERS_H
|
||||||
@ -75,7 +75,7 @@ public:
|
|||||||
bool DayMatches(time_t t) const;
|
bool DayMatches(time_t t) const;
|
||||||
static time_t IncDay(time_t t, int Days);
|
static time_t IncDay(time_t t, int Days);
|
||||||
static time_t SetTime(time_t t, int SecondsFromMidnight);
|
static time_t SetTime(time_t t, int SecondsFromMidnight);
|
||||||
char *SetFile(const char *File);
|
void SetFile(const char *File);
|
||||||
bool Matches(time_t t = 0, bool Directly = false, int Margin = 0) const;
|
bool Matches(time_t t = 0, bool Directly = false, int Margin = 0) const;
|
||||||
int Matches(const cEvent *Event, int *Overlap = NULL) const;
|
int Matches(const cEvent *Event, int *Overlap = NULL) const;
|
||||||
bool Expired(void) const;
|
bool Expired(void) const;
|
||||||
|
Loading…
Reference in New Issue
Block a user