The character '|' in description texts of EPG records is now interpreted as a newline character

This commit is contained in:
Klaus Schmidinger 2002-12-06 14:21:00 +01:00
parent 9cb56dfea4
commit e5499ed650
5 changed files with 15 additions and 6 deletions

View File

@ -458,6 +458,8 @@ Gerhard Steiner <steiner@mail.austria.com>
the 'epg.data' file the 'epg.data' file
for suggesting the new configuration file 'reccmds.conf' to define commands that for suggesting the new configuration file 'reccmds.conf' to define commands that
shall be executed from the "Recordings" menu shall be executed from the "Recordings" menu
for suggesting to interpret the character '|' in the description texts of EPG
records as a newline character
Jaakko Hyvätti <jaakko@hyvatti.iki.fi> Jaakko Hyvätti <jaakko@hyvatti.iki.fi>
for translating OSD texts to the Finnish language for translating OSD texts to the Finnish language

View File

@ -1836,3 +1836,8 @@ Video Disk Recorder Revision History
function of a given plugin (see man vdr(5) for details). function of a given plugin (see man vdr(5) for details).
- The new plugin 'sky' can be used to integrate a Sky Digibox into the VDR system, - The new plugin 'sky' can be used to integrate a Sky Digibox into the VDR system,
using a Kfir MPEG2 encoder card (see PLUGINS/src/sky/README for details). using a Kfir MPEG2 encoder card (see PLUGINS/src/sky/README for details).
2002-12-06: Version 1.1.19
- The character '|' in description texts of EPG records is now interpreted as a
newline character (suggested by Gerhard Steiner).

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: config.h 1.142 2002/11/24 20:09:56 kls Exp $ * $Id: config.h 1.143 2002/12/06 14:17:55 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -19,7 +19,7 @@
#include "device.h" #include "device.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.1.18" #define VDRVERSION "1.1.19"
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99

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: interface.c 1.60 2002/11/01 10:50:38 kls Exp $ * $Id: interface.c 1.61 2002/12/06 14:13:16 kls Exp $
*/ */
#include "interface.h" #include "interface.h"
@ -157,6 +157,8 @@ char *cInterface::WrapText(const char *Text, int Width, int *Height)
t[strlen(t) - 1] = 0; // skips trailing newlines t[strlen(t) - 1] = 0; // skips trailing newlines
for (char *p = t; *p; ) { for (char *p = t; *p; ) {
if (*p == '|')
*p = '\n';
if (*p == '\n') { if (*p == '\n') {
Lines++; Lines++;
w = 0; w = 0;

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.16 2002/12/01 10:34:40 kls Exp $ .\" $Id: vdr.5 1.17 2002/12/06 14:21:00 kls Exp $
.\" .\"
.TH vdr 5 "24 Nov 2002" "1.2.0" "Video Disk Recorder Files" .TH vdr 5 "6 Dec 2002" "1.2.0" "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
@ -549,7 +549,7 @@ in (if this is left empty or 0 this event will not be overwritten\
or modified by data that comes from the DVB stream) or modified by data that comes from the DVB stream)
<title> @is the title of the event <title> @is the title of the event
<subtitle> @is the subtitle (typically the name of the episode etc.) <subtitle> @is the subtitle (typically the name of the episode etc.)
<description> @is the description of the event <description> @is the description of the event (any '|' characters will be interpreted as newlines)
.TE .TE
This file will be read at program startup in order to restore the results of This file will be read at program startup in order to restore the results of