diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | sdt.c | 7 | 
3 files changed, 7 insertions, 6 deletions
| diff --git a/CONTRIBUTORS b/CONTRIBUTORS index eb77f68b..f60678d9 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2476,6 +2476,7 @@ Johann Friedrichs <johann.friedrichs@web.de>   for pointing out that "DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE   -D_LARGEFILE64_SOURCE" should be added to Make.config.   for adding stream type 11172 AUDIO to cPatPmtParser::ParsePmt() + for removing the workaround for short channel names of "Kabel Deutschland"  Timo Helkio <timolavi@mbnet.fi>   for reporting a hangup when replaying a TS recording with subtitles activated @@ -6197,7 +6197,7 @@ Video Disk Recorder Revision History  - Fixed the default value for "Pause key handling" in the MANUAL (reported by    Diego Pierotto). -2009-12-06: Version 1.7.11 +2009-12-13: Version 1.7.11  - Fixed resetting the file size when regenerating the index file.  - The new function cDevice::PatPmtParser() can be used in derived devices to access @@ -6214,3 +6214,6 @@ Video Disk Recorder Revision History    Friedrichs).  - Removed debug output of '-' from cTransfer::Receive().  - Added defines for large files to the 'newplugin' script (reported by Udo Richter). +- Removed the workaround for short channel names of "Kabel Deutschland", because +  apparently they now have their data according to the DVB standard (thanks to +  Johann Friedrichs). @@ -4,7 +4,7 @@   * See the main source file 'vdr.c' for copyright information and   * how to reach the author.   * - * $Id: sdt.c 2.2 2009/12/06 12:11:23 kls Exp $ + * $Id: sdt.c 2.3 2009/12/13 11:54:33 kls Exp $   */  #include "sdt.h" @@ -65,11 +65,8 @@ void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length                          char *ps = compactspace(ShortNameBuf);                          if (!*ps && cSource::IsCable(Source())) {                             // Some cable providers don't mark short channel names according to the -                           // standard, but rather go their own way and use "name>short name" or -                           // "name, short name": +                           // standard, but rather go their own way and use "name>short name":                             char *p = strchr(pn, '>'); // fix for UPC Wien -                           if (!p) -                              p = strchr(pn, ','); // fix for "Kabel Deutschland"                             if (p && p > pn) {                                *p++ = 0;                                strcpy(ShortNameBuf, skipspace(p)); | 
