summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY3
-rw-r--r--recording.c6
-rwxr-xr-xsummary2info.pl6
4 files changed, 9 insertions, 7 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 3eca5dbf..e066556e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1458,6 +1458,7 @@ Thomas Günther <tom1@toms-cafe.de>
editing mark, or '9' after the last one
for suggesting to move cMenuEditTimer and cMenuEvent to menu.h so that plugins
can use it
+ for fixing converting arbitrarily formatted summary.vdr files
David Woodhouse <dwmw2@infradead.org>
for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with
diff --git a/HISTORY b/HISTORY
index 07873ab2..ba8deb8c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3807,6 +3807,7 @@ Video Disk Recorder Revision History
- Implemented a hash for the channels to reduce the system load in the EIT scanning
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 converting arbitrarily formatted summary.vdr files (thanks to Thomas Günther).
diff --git a/recording.c b/recording.c
index 3640a8e9..4a12b71e 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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"
@@ -492,11 +492,11 @@ cRecording::cRecording(const char *FileName)
line++;
}
fclose(f);
- if (line == 1) {
+ if (!data[2]) {
data[2] = data[1];
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,
// so assume the short text is missing and concatenate
// line 1 and line 2 to be the long text:
diff --git a/summary2info.pl b/summary2info.pl
index 42906774..5d68d794 100755
--- a/summary2info.pl
+++ b/summary2info.pl
@@ -10,7 +10,7 @@
# See the main source file 'vdr.c' for copyright information and
# 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";
@@ -33,11 +33,11 @@ for $SummaryFile (@SummaryFiles) {
}
}
close(F);
- if ($line == 1) {
+ if (!$data[2]) {
$data[2] = $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,
# so assume the short text is missing and concatenate
# line 1 and line 2 to be the long text: