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

Fixed handling 'summary.vdr' files with more than two empty lines

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-06-04 11:33:09 +02:00
parent 7bffdb9e82
commit eecf0b6616
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -828,6 +828,7 @@ Christian Jacobsen <christian.jacobsen@stageholding.de>
for reporting a problem in handling the '-E' options in version 1.3.18 for reporting a problem in handling the '-E' options in version 1.3.18
for reporting a problem in case a station defines all 32 audio PIDs for reporting a problem in case a station defines all 32 audio PIDs
for suggestions and experiments regarding the buffer reserve in cTransfer for suggestions and experiments regarding the buffer reserve in cTransfer
for reporting a problem with 'summary.vdr' files with more than two empty lines
Andreas Mair <Andreas.Mair@linogate.com> Andreas Mair <Andreas.Mair@linogate.com>
for reporting a short display of the main menu if a plugin displays its own OSD and for reporting a short display of the main menu if a plugin displays its own OSD and

2
HISTORY
View File

@ -3582,3 +3582,5 @@ Video Disk Recorder Revision History
- Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed handling 'summary.vdr' files with more than two empty lines (thanks to
Christian Jacobsen for reporting this one).

6
recording.c
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: recording.c 1.107 2005/05/29 11:16:57 kls Exp $ * $Id: recording.c 1.108 2005/06/04 11:31:24 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -480,8 +480,8 @@ cRecording::cRecording(const char *FileName)
char *data[3] = { NULL }; char *data[3] = { NULL };
cReadLine ReadLine; cReadLine ReadLine;
char *s; char *s;
while ((s = ReadLine.Read(f)) != NULL && line < 3) { while ((s = ReadLine.Read(f)) != NULL) {
if (*s) { if (*s || line > 1) {
if (data[line]) { if (data[line]) {
int len = strlen(s); int len = strlen(s);
len += strlen(data[line]) + 1; len += strlen(data[line]) + 1;

4
summary2info.pl
View File

@ -10,7 +10,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: summary2info.pl 1.2 2005/05/22 10:37:47 kls Exp $ # $Id: summary2info.pl 1.3 2005/06/04 11:33:09 kls Exp $
$VideoDir = $ARGV[0] || die "please provide the name of the video directory\n"; $VideoDir = $ARGV[0] || die "please provide the name of the video directory\n";
@ -24,7 +24,7 @@ for $SummaryFile (@SummaryFiles) {
@data = (); @data = ();
while (<F>) { while (<F>) {
chomp; chomp;
if ($_) { if ($_ || $line > 1) {
$data[$line] .= '|' if ($data[$line]); $data[$line] .= '|' if ($data[$line]);
$data[$line] .= $_; $data[$line] .= $_;
} }