The language code in the 'X' component records of EPG data can now consist of two codes, separated by '+'

4 files changed, 10 insertions, 8 deletions

diff --git a/HISTORY b/HISTORY
index 7789b301..36bed719 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4341,3 +4341,5 @@ Video Disk Recorder Revision History
   so that it sets 'size' and 'data' to 0.
 - Now resetting the channel number if the number entered through the numeric keys
   exceeds the maximum channel number (thanks to Rolf Ahrenberg).
+- The language code in the 'X' component records of EPG data can now consist of
+  two codes, separated by '+'.
diff --git a/epg.c b/epg.c
index efc5455f..aa22a988 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.58 2006/02/03 13:16:54 kls Exp $
+ * $Id: epg.c 1.59 2006/02/18 15:01:59 kls Exp $
  */
 
 #include "epg.h"
@@ -23,14 +23,14 @@
 cString tComponent::ToString(void)
 {
   char buffer[256];
-  snprintf(buffer, sizeof(buffer), "%X %02X %-3s %s", stream, type, language, description ? description : "");
+  snprintf(buffer, sizeof(buffer), "%X %02X %s %s", stream, type, language, description ? description : "");
   return buffer;
 }
 
 bool tComponent::FromString(const char *s)
 {
   unsigned int Stream, Type;
-  int n = sscanf(s, "%X %02X %3c %a[^\n]", &Stream, &Type, language, &description);
+  int n = sscanf(s, "%X %02X %7s %a[^\n]", &Stream, &Type, language, &description); // 7 = MAXLANGCODE2 - 1
   if (n != 4 || isempty(description)) {
      free(description);
      description = NULL;
diff --git a/epg.h b/epg.h
index ad245243..63addc0d 100644
--- a/epg.h
+++ b/epg.h
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.h 1.30 2006/01/29 14:03:13 kls Exp $
+ * $Id: epg.h 1.31 2006/02/18 14:42:25 kls Exp $
  */
 
 #ifndef __EPG_H
@@ -24,7 +24,7 @@ enum eDumpMode { dmAll, dmPresent, dmFollowing, dmAtTime };
 struct tComponent {
   uchar stream;
   uchar type;
-  char language[4];
+  char language[MAXLANGCODE2];
   char *description;
   cString ToString(void);
   bool FromString(const char *s);
diff --git a/vdr.5 b/vdr.5
index 214aac81..8468ee4c 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,9 +8,9 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.48 2006/01/29 11:31:58 kls Exp $
+.\" $Id: vdr.5 1.49 2006/02/18 15:59:00 kls Exp $
 .\"
-.TH vdr 5 "08 Jan 2006" "1.3.38" "Video Disk Recorder Files"
+.TH vdr 5 "19 Feb 2006" "1.3.43" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -641,7 +641,7 @@ l l.
 <description>  @is the description of the event (any '|' characters will be interpreted as newlines)
 <stream>       @is the stream content (1 = video, 2 = audio)
 <type>         @is the stream type according to ETSI EN 300 468
-<language>     @is the three letter language code
+<language>     @is the three letter language code (optionally two codes, separated by '+')
 <descr>        @is the description of this stream component
 <vps time>     @is the Video Programming Service time of this event
 .TE