Added support for circular polarization

6 files changed, 11 insertions, 7 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8dfaa1a9..904f68c5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -812,6 +812,7 @@ Wolfgang Goeller <wgoeller@heraklit.ch>
 Jonan Santiago <jonan-lists-vdr@callisia.com>
  for fixing handling EPG data where the "extended event descriptor" comes before the
  "short event" or a "time shifted event"
+ for adding support for circular polarization
 
 Juri Haberland <juri@koschikode.com>
  for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index 7b1e8ec8..f69bbbef 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3284,3 +3284,4 @@ Video Disk Recorder Revision History
 - The setup option "Recording/Record Dobly Digital" has been renamed and moved to
   "DVB/Use Dolby Digital". It now controls whether Dolby Digital is recorded and
   whether an available DD audio track will appear in the "Audio" menu.
+- Added support for circular polarization (thanks to Jonan Santiago).
diff --git a/diseqc.c b/diseqc.c
index 801e1cd8..bae59960 100644
--- a/diseqc.c
+++ b/diseqc.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: diseqc.c 1.3 2004/10/24 11:04:56 kls Exp $
+ * $Id: diseqc.c 1.4 2005/01/09 13:05:11 kls Exp $
  */
 
 #include "diseqc.h"
@@ -37,7 +37,7 @@ bool cDiseqc::Parse(const char *s)
      source = cSource::FromString(sourcebuf);
      if (Sources.Get(source)) {
         polarization = toupper(polarization);
-        if (polarization == 'V' || polarization == 'H') {
+        if (polarization == 'V' || polarization == 'H' || polarization == 'L' || polarization == 'R') {
            parsing = true;
            char *CurrentAction = NULL;
            while (Execute(&CurrentAction) != daNone)
diff --git a/dvbdevice.c b/dvbdevice.c
index 42c51444..9c7fd381 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.c 1.112 2005/01/07 15:54:52 kls Exp $
+ * $Id: dvbdevice.c 1.113 2005/01/09 13:04:20 kls Exp $
  */
 
 #include "dvbdevice.h"
@@ -242,7 +242,7 @@ bool cDvbTuner::SetFrontend(void)
                frequency -= Setup.LnbFrequHi;
                tone = SEC_TONE_ON;
                }
-            int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
+            int volt = (channel.Polarization() == 'v' || channel.Polarization() == 'V' || channel.Polarization() == 'r' || channel.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18;
             CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt));
             CHECK(ioctl(fd_frontend, FE_SET_TONE, tone));
             }
diff --git a/menu.c b/menu.c
index c4ed75da..6f8ef283 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.333 2005/01/09 12:16:17 kls Exp $
+ * $Id: menu.c 1.334 2005/01/09 13:04:49 kls Exp $
  */
 
 #include "menu.h"
@@ -274,7 +274,7 @@ void cMenuEditChannel::Setup(void)
   Add(new cMenuEditIntItem( tr("Rid"),          &data.rid, 0));
   XXX*/
   // Parameters for specific types of sources:
-  ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hv"));
+  ST(" S ")  Add(new cMenuEditChrItem( tr("Polarization"), &data.polarization, "hvlr"));
   ST("CS ")  Add(new cMenuEditIntItem( tr("Srate"),        &data.srate));
   ST("CST")  Add(new cMenuEditMapItem( tr("Inversion"),    &data.inversion,    InversionValues, tr("off")));
   ST("CST")  Add(new cMenuEditMapItem( tr("CoderateH"),    &data.coderateH,    CoderateValues, tr("none")));
diff --git a/vdr.5 b/vdr.5
index c84189bd..44ea3e68 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.31 2005/01/02 13:57:10 kls Exp $
+.\" $Id: vdr.5 1.32 2005/01/09 13:16:40 kls Exp $
 .\"
 .TH vdr 5 "19 Dec 2004" "1.3.18" "Video Disk Recorder Files"
 .SH NAME
@@ -89,7 +89,9 @@ l l.
 \fBG\fR@Guard interval (4, 8, 16, 32)
 \fBH\fR@Horizontal polarization
 \fBI\fR@Inversion (0, 1)
+\fBL\fR@Left circular polarization
 \fBM\fR@Modulation (0, 16, 32, 64, 128, 256)
+\fBR\fR@Right circular polarization
 \fBT\fR@Transmission mode (2, 8)
 \fBV\fR@Vertical polarization
 \fBY\fR@Hierarchy (0, 1, 2, 4)