frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added a 'const' version of cTimers::GetTimer()

This commit is contained in:
Klaus Schmidinger 2016-12-22 14:27:01 +01:00
parent 3d488bcf1c
commit bac165a751
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -2927,6 +2927,7 @@ Lars Hanisch <dvb@flensrocker.de>
for making VDR read command line options from *.conf files in /etc/vdr/conf.d
for adding a missing backslash to the help text of the SVDRP command MOVR
for fixing a memory leak in case of broken Extended Event Descriptors
for adding a 'const' version of cTimers::GetTimer()
Alex Lasnier <alex@fepg.org>
for adding tuning support for ATSC devices

1
HISTORY
View File

@ -8871,3 +8871,4 @@ Video Disk Recorder Revision History
- Fixed truncated date/time strings in the skins on multi-byte UTF-8 systems
(reported by Sergey Chernyavskiy).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Added a 'const' version of cTimers::GetTimer() (thanks to Lars Hanisch).

11
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 4.5 2015/09/13 13:10:24 kls Exp $
* $Id: timers.c 4.6 2016/12/22 14:24:44 kls Exp $
*/
#include "timers.h"
@ -748,9 +748,9 @@ const cTimer *cTimers::GetById(int Id) const
return NULL;
}
cTimer *cTimers::GetTimer(cTimer *Timer)
const cTimer *cTimers::GetTimer(const cTimer *Timer) const
{
for (cTimer *ti = First(); ti; ti = Next(ti)) {
for (const cTimer *ti = First(); ti; ti = Next(ti)) {
if (!ti->Remote() &&
ti->Channel() == Timer->Channel() &&
(ti->WeekDays() && ti->WeekDays() == Timer->WeekDays() || !ti->WeekDays() && ti->Day() == Timer->Day()) &&
@ -761,6 +761,11 @@ cTimer *cTimers::GetTimer(cTimer *Timer)
return NULL;
}
cTimer *cTimers::GetTimer(const cTimer *Timer)
{
return (cTimer *)GetTimer(Timer);
}
const cTimer *cTimers::GetMatch(time_t t) const
{
static int LastPending = -1;

5
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 4.3 2015/09/09 10:40:24 kls Exp $
* $Id: timers.h 4.4 2016/12/22 14:23:50 kls Exp $
*/
#ifndef __TIMERS_H
@ -170,7 +170,8 @@ public:
static int NewTimerId(void);
const cTimer *GetById(int Id) const;
cTimer *GetById(int Id) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetById(Id)); };
cTimer *GetTimer(cTimer *Timer);
const cTimer *GetTimer(const cTimer *Timer) const;
cTimer *GetTimer(const cTimer *Timer);
const cTimer *GetMatch(time_t t) const;
cTimer *GetMatch(time_t t) { return const_cast<cTimer *>(static_cast<const cTimers *>(this)->GetMatch(t)); };
const cTimer *GetMatch(const cEvent *Event, eTimerMatch *Match = NULL) const;