diff options
author | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2003-09-14 18:00:00 +0200 |
---|---|---|
committer | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2003-09-14 18:00:00 +0200 |
commit | 3feeb907f73f0b8ebc067f4b5686dd543121c1f1 (patch) | |
tree | 6efc95a5beaf9d1736af42bfbc67ac6f2c53a1c2 /channels.c | |
parent | bff4529f013605e0456fa12e4c0468ffafaa4289 (diff) | |
download | vdr-patch-lnbsharing-3feeb907f73f0b8ebc067f4b5686dd543121c1f1.tar.gz vdr-patch-lnbsharing-3feeb907f73f0b8ebc067f4b5686dd543121c1f1.tar.bz2 |
Version 1.2.5pre3vdr-1.2.5pre3
- Fixed dropping out of replay mode while viewing a recording that is still
going on (thanks to Oliver Endriss for reporting and helping to debug this
one).
- Fixed handling ':' characters in channel names when reading channels.conf
(thanks to Reinhard Nissl for reporting this one).
- Fixed the URL to the 'Doxygen' tool in INSTALL (thanks to Dirk Essl).
- Removed the obsolete chapter "Stopping a recording on the primary DVB interface"
from MANUAL.
- Completed Dutch language texts (thanks to Hans Dingemans).
- Made 'diseqc.conf' a required file only if Setup.DiSEqC is activated (thanks to
Thomas Schmidt).
- VDR now starts up even if 'keymacros.conf' references a plugin that is currently
not loaded (suggested by Alexander Wetzel).
- Fixed checking for VIDEO_STREAM_S in cRemux::SetBrokenLink() (thanks to Oliver
Endriss).
- Added 'repeat' function to keys '7' and '9' ("jump to mark") in replay mode
(suggested by Oliver Endriss).
- Made cOsdMenu::Display() virtual, which allows plugins to do some additional
processing after calling the base class function (suggested by Jan Rieger).
- Updated 'ca.conf' (thanks to Marco Franceschetti).
Diffstat (limited to 'channels.c')
-rw-r--r-- | channels.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: channels.c 1.13 2003/08/16 09:12:26 kls Exp $ + * $Id: channels.c 1.14 2003/09/09 18:55:26 kls Exp $ */ #include "channels.h" @@ -315,6 +315,7 @@ const char *cChannel::ToText(void) bool cChannel::Parse(const char *s, bool AllowNonUniqueID) { + bool ok = true; if (*s == ':') { groupSep = true; if (*++s == '@' && *++s) { @@ -346,7 +347,7 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID) vpid = ppid = 0; apid1 = apid2 = 0; dpid1 = dpid2 = 0; - bool ok = false; + ok = false; if (parambuf && sourcebuf && vpidbuf && apidbuf) { ok = StringToParameters(parambuf) && (source = cSource::FromString(sourcebuf)) >= 0; char *p = strchr(vpidbuf, '+'); @@ -372,13 +373,12 @@ bool cChannel::Parse(const char *s, bool AllowNonUniqueID) esyslog("ERROR: channel data not unique!"); return false; } - return ok; } else return false; } strreplace(name, '|', ':'); - return true; + return ok; } bool cChannel::Save(FILE *f) |