Fixed saving the polarization parameter of channels that have a number in the 'source' parameter

4 files changed, 16 insertions, 5 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 399ba30d..39f5faca 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -460,3 +460,7 @@ Dennis Noordsij <dennis.noordsij@wiral.com>
 
 Steffen Barszus <st_barszus@gmx.de>
  for reporting a bug in switching audio tracks in 'Transfer Mode' on the primary DVB device
+
+Peter Seyringer <e9425234@student.tuwien.ac.at>
+ for reporting a bug in saving the polarization parameter of channels that have a
+ number in the 'source' parameter
diff --git a/HISTORY b/HISTORY
index dc276f51..5ebb3229 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1721,3 +1721,8 @@ Video Disk Recorder Revision History
   DVB_DRIVER_VERSION stuff has been replaced with DO_REC_AND_PLAY_ON_PRIMARY_DEVICE,
   which can be used to disable simultaneous recording and replaying on the primary
   DVB device in case there are problems with this.
+
+2002-11-08: Version 1.1.16
+
+- Fixed saving the polarization parameter of channels that have a number in the
+  'source' parameter (thanks to Peter Seyringer for reporting this one).
diff --git a/channels.c b/channels.c
index 4f1bcec3..e9fe3de6 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: channels.c 1.6 2002/11/01 10:26:45 kls Exp $
+ * $Id: channels.c 1.7 2002/11/08 13:21:16 kls Exp $
  */
 
 #include "channels.h"
@@ -128,7 +128,7 @@ cChannel::cChannel(void)
 {
   *name = 0;
   frequency    = 0;
-  source       = 0;
+  source       = cSource::FromString("S19.2E");
   srate        = 0;
   vpid         = 0;
   apid1        = 0;
@@ -155,7 +155,7 @@ cChannel::cChannel(const cChannel *Channel)
 {
   strcpy(name,   Channel ? Channel->name         : "Pro7");
   frequency    = Channel ? Channel->frequency    : 12480;
-  source       = Channel ? Channel->source       : 0;
+  source       = Channel ? Channel->source       : cSource::FromString("S19.2E");
   srate        = Channel ? Channel->srate        : 27500;
   vpid         = Channel ? Channel->vpid         : 255;
   apid1        = Channel ? Channel->apid1        : 256;
@@ -185,6 +185,8 @@ static int PrintParameter(char *p, char Name, int Value)
 const char *cChannel::ParametersToString(void)
 {
   char type = *cSource::ToString(source);
+  if (isdigit(type))
+     type = 'S';
 #define ST(s) if (strchr(s, type))
   static char buffer[64];
   char *q = buffer;
diff --git a/config.h b/config.h
index 22eb9ecd..af8d92b9 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.138 2002/11/01 09:27:17 kls Exp $
+ * $Id: config.h 1.139 2002/11/08 13:16:12 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -20,7 +20,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.15"
+#define VDRVERSION "1.1.16"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99