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 converting arbitrarily formatted summary.vdr files

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-09-17 09:20:31 +02:00
parent 791fe6c40e
commit 5147d8abbc
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1458,6 +1458,7 @@ Thomas G
editing mark, or '9' after the last one editing mark, or '9' after the last one
for suggesting to move cMenuEditTimer and cMenuEvent to menu.h so that plugins for suggesting to move cMenuEditTimer and cMenuEvent to menu.h so that plugins
can use it can use it
for fixing converting arbitrarily formatted summary.vdr files
David Woodhouse <dwmw2@infradead.org> David Woodhouse <dwmw2@infradead.org>
for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with

3
HISTORY
View File

@ -3807,6 +3807,7 @@ Video Disk Recorder Revision History
- Implemented a hash for the channels to reduce the system load in the EIT scanning - Implemented a hash for the channels to reduce the system load in the EIT scanning
thread (based on a patch by Georg Acher). thread (based on a patch by Georg Acher).
2005-09-14: Version 1.3.33 2005-09-17: Version 1.3.33
- Fixed two errors in 'newplugin' (thanks to Alexander Rieger). - Fixed two errors in 'newplugin' (thanks to Alexander Rieger).
- Fixed converting arbitrarily formatted summary.vdr files (thanks to Thomas Günther).

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.113 2005/09/10 12:36:48 kls Exp $ * $Id: recording.c 1.114 2005/09/17 09:14:36 kls Exp $
*/ */
#include "recording.h" #include "recording.h"
@ -492,11 +492,11 @@ cRecording::cRecording(const char *FileName)
line++; line++;
} }
fclose(f); fclose(f);
if (line == 1) { if (!data[2]) {
data[2] = data[1]; data[2] = data[1];
data[1] = NULL; data[1] = NULL;
} }
else if (line == 2) { else if (data[1] && data[2]) {
// if line 1 is too long, it can't be the short text, // if line 1 is too long, it can't be the short text,
// so assume the short text is missing and concatenate // so assume the short text is missing and concatenate
// line 1 and line 2 to be the long text: // line 1 and line 2 to be the long text:

6
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.4 2005/09/10 12:40:40 kls Exp $ # $Id: summary2info.pl 1.5 2005/09/17 09:20:31 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";
@ -33,11 +33,11 @@ for $SummaryFile (@SummaryFiles) {
} }
} }
close(F); close(F);
if ($line == 1) { if (!$data[2]) {
$data[2] = $data[1]; $data[2] = $data[1];
$data[1] = ""; $data[1] = "";
} }
elsif ($line == 2) { elsif ($data[1] && $data[2]) {
# if line 1 is too long, it can't be the short text, # if line 1 is too long, it can't be the short text,
# so assume the short text is missing and concatenate # so assume the short text is missing and concatenate
# line 1 and line 2 to be the long text: # line 1 and line 2 to be the long text: