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

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

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-02-18 15:59:43 +01:00
parent 53f77ddded
commit 492f06175a
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -4341,3 +4341,5 @@ Video Disk Recorder Revision History
so that it sets 'size' and 'data' to 0. so that it sets 'size' and 'data' to 0.
- Now resetting the channel number if the number entered through the numeric keys - Now resetting the channel number if the number entered through the numeric keys
exceeds the maximum channel number (thanks to Rolf Ahrenberg). 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 '+'.

6
epg.c
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by * Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * 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" #include "epg.h"
@ -23,14 +23,14 @@
cString tComponent::ToString(void) cString tComponent::ToString(void)
{ {
char buffer[256]; 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; return buffer;
} }
bool tComponent::FromString(const char *s) bool tComponent::FromString(const char *s)
{ {
unsigned int Stream, Type; 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)) { if (n != 4 || isempty(description)) {
free(description); free(description);
description = NULL; description = NULL;

4
epg.h
View File

@ -7,7 +7,7 @@
* Original version (as used in VDR before 1.3.0) written by * Original version (as used in VDR before 1.3.0) written by
* Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>. * 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 #ifndef __EPG_H
@ -24,7 +24,7 @@ enum eDumpMode { dmAll, dmPresent, dmFollowing, dmAtTime };
struct tComponent { struct tComponent {
uchar stream; uchar stream;
uchar type; uchar type;
char language[4]; char language[MAXLANGCODE2];
char *description; char *description;
cString ToString(void); cString ToString(void);
bool FromString(const char *s); bool FromString(const char *s);

6
vdr.5
View File

@ -8,9 +8,9 @@
.\" License as specified in the file COPYING that comes with the .\" License as specified in the file COPYING that comes with the
.\" vdr distribution. .\" 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 .SH NAME
vdr file formats - the Video Disk Recorder Files vdr file formats - the Video Disk Recorder Files
.SH DESCRIPTION .SH DESCRIPTION
@ -641,7 +641,7 @@ l l.
<description> @is the description of the event (any '|' characters will be interpreted as newlines) <description> @is the description of the event (any '|' characters will be interpreted as newlines)
<stream> @is the stream content (1 = video, 2 = audio) <stream> @is the stream content (1 = video, 2 = audio)
<type> @is the stream type according to ETSI EN 300 468 <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 <descr> @is the description of this stream component
<vps time> @is the Video Programming Service time of this event <vps time> @is the Video Programming Service time of this event
.TE .TE