Removed 'preferred' field to not break channels.conf format in 0.63 release0.6.3

5 files changed, 7 insertions, 16 deletions

diff --git a/HISTORY b/HISTORY
index 6ab0b897..dafab3b7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -157,7 +157,6 @@ Video Disk Recorder Revision History
   There is currently no mechanism to define and maintain "Channel groups" via
   the menu, so you'll have to insert "Channel group" control lines into your
   'channels.conf' file manually (for example with a text editor).
-  XXX additional fields for 'preferred' etc???
 - Started a new file named FORMATS with a description of the various file
   formats used by VDR.
 - The "Primary DVB interface" can now be chosen via the "Setup" menu.
diff --git a/MANUAL b/MANUAL
index 6cf91423..91c9bffd 100644
--- a/MANUAL
+++ b/MANUAL
@@ -193,4 +193,4 @@ Video Disk Recorder User's Manual
                              be at the top (bottom) of that page
                          1 = dto., but the cursor remains at the bottom (top) of
                              the page (this mode allows for faster scrolling
-                             through long lists)
+                             through long lists).
diff --git a/config.c b/config.c
index 188e8973..0a965ee5 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.21 2000/09/10 14:32:45 kls Exp $
+ * $Id: config.c 1.22 2000/09/10 15:07:15 kls Exp $
  */
 
 #include "config.h"
@@ -196,7 +196,6 @@ cChannel::cChannel(const cChannel *Channel)
   apid         = Channel ? Channel->apid         : 256;
   ca           = Channel ? Channel->ca           : 0;
   pnr          = Channel ? Channel->pnr          : 0;
-  preferred    = Channel ? Channel->preferred    : 0;
   groupSep     = Channel ? Channel->groupSep     : false;
 }
 
@@ -212,7 +211,7 @@ const char *cChannel::ToText(cChannel *Channel)
   if (Channel->groupSep)
      asprintf(&buffer, ":%s\n", s);
   else
-     asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, Channel->apid, Channel->ca, Channel->pnr, Channel->preferred);
+     asprintf(&buffer, "%s:%d:%c:%d:%d:%d:%d:%d:%d\n", s, Channel->frequency, Channel->polarization, Channel->diseqc, Channel->srate, Channel->vpid, Channel->apid, Channel->ca, Channel->pnr);
   return buffer;
 }
 
@@ -235,15 +234,10 @@ bool cChannel::Parse(const char *s)
      }
   else {
      groupSep = false;
-     int fields = sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid, &ca, &pnr, &preferred);
-#define VER062_FIELDS 9
-#define VER063_FIELDS 10
-     if (fields == VER062_FIELDS || fields == VER063_FIELDS) {
+     int fields = sscanf(s, "%a[^:]:%d:%c:%d:%d:%d:%d:%d:%d", &buffer, &frequency, &polarization, &diseqc, &srate, &vpid, &apid, &ca, &pnr);
+     if (fields == 9) {
         strn0cpy(name, buffer, MaxChannelName);
         delete buffer;
-        if (fields == VER062_FIELDS) {
-           preferred = 0;
-           }
         }
      else
         return false;
diff --git a/config.h b/config.h
index 862e116f..30dd9bac 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.18 2000/09/10 14:32:05 kls Exp $
+ * $Id: config.h 1.19 2000/09/10 15:05:08 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -75,7 +75,6 @@ public:
   int apid;
   int ca;
   int pnr;
-  int preferred; //TODO implement "preferred channel" mechanism
   int number;    // Sequence number assigned on load
   bool groupSep;
   cChannel(void);
diff --git a/menu.c b/menu.c
index f4aa5d8e..ad803cf4 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.25 2000/09/10 14:45:29 kls Exp $
+ * $Id: menu.c 1.26 2000/09/10 15:06:15 kls Exp $
  */
 
 #include "menu.h"
@@ -513,7 +513,6 @@ cMenuEditChannel::cMenuEditChannel(int Index)
      Add(new cMenuEditIntItem( "Apid",         &data.apid, 0, 10000)); //TODO exact limits???
      Add(new cMenuEditIntItem( "CA",           &data.ca, 0, cDvbApi::NumDvbApis));
      Add(new cMenuEditIntItem( "Pnr",          &data.pnr, 0));
-     Add(new cMenuEditIntItem( "Preferred",    &data.preferred, 0, 1)); //TODO implement "preferred channel" mechanism
      }
 }