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

Now trying to get a timer's channel without RID when loading 'timers.conf'

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-10-12 10:35:22 +02:00
parent d14de196e8
commit 57239b8271
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -836,3 +836,6 @@ Andreas Trauer <vdr@trauers.homelinux.net>
Markus Hardt <markus.hardt@gmx.net> Markus Hardt <markus.hardt@gmx.net>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date
Thomas Rausch <Thomas.Rausch@gmx.de>
for making VDR try to get a timer's channel without RID when loading 'timers.conf'

2
HISTORY
View File

@ -2417,3 +2417,5 @@ Video Disk Recorder Revision History
- Fixed handling rc key learning in case cRemote::Initialize() returns 'false' - Fixed handling rc key learning in case cRemote::Initialize() returns 'false'
(thanks to Oliver Endriss). (thanks to Oliver Endriss).
- Fixed initializing the highlight area in cDvbSpuDecoder (thanks to Sven Goethel). - Fixed initializing the highlight area in cDvbSpuDecoder (thanks to Sven Goethel).
- Now trying to get a timer's channel without RID when loading 'timers.conf'
(thanks to Thomas Rausch).

4
timers.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: timers.c 1.5 2003/05/11 13:48:49 kls Exp $ * $Id: timers.c 1.6 2003/10/12 10:33:09 kls Exp $
*/ */
#include "timers.h" #include "timers.h"
@ -217,7 +217,7 @@ bool cTimer::Parse(const char *s)
strreplace(file, '|', ':'); strreplace(file, '|', ':');
strreplace(summary, '|', '\n'); strreplace(summary, '|', '\n');
tChannelID cid = tChannelID::FromString(channelbuffer); tChannelID cid = tChannelID::FromString(channelbuffer);
channel = cid.Valid() ? Channels.GetByChannelID(cid) : Channels.GetByNumber(atoi(channelbuffer)); channel = cid.Valid() ? Channels.GetByChannelID(cid, true) : Channels.GetByNumber(atoi(channelbuffer));
if (!channel) { if (!channel) {
esyslog("ERROR: channel %s not defined", channelbuffer); esyslog("ERROR: channel %s not defined", channelbuffer);
result = false; result = false;