summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-07-27 13:45:55 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2001-07-27 13:45:55 +0200
commit47b859c15677e73e2e0a0fef8f244a6b3fd6b3df (patch)
treebaf9b4b56d2f1e53984ad95897d47fa9e8942cf3
parentd008680ad78832701d59d54733d302c0287bc879 (diff)
downloadvdr-47b859c15677e73e2e0a0fef8f244a6b3fd6b3df.tar.gz
vdr-47b859c15677e73e2e0a0fef8f244a6b3fd6b3df.tar.bz2
DiSEqC support can now be generally enabled/disabled
-rw-r--r--CONTRIBUTORS3
-rw-r--r--HISTORY3
-rw-r--r--MANUAL4
-rw-r--r--config.c5
-rw-r--r--config.h3
-rw-r--r--dvbapi.c4
-rw-r--r--i18n.c11
-rw-r--r--menu.c3
8 files changed, 28 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 886fca5d..3d1a973f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -83,8 +83,7 @@ Paulo Manuel Martins Lopes <pmml@netvita.pt>
for translating the OSD texts to the Portugese language
Markus Lang <markus.lang@nissan-db.de> and Ulrich Röder <dynamite@efr-net.de>
- for patching the Diseqc code so that it doesn't send a Diseqc command if
- the Diseqc value for a given channel is '0'
+ for making DiSEqC support configurable
Jean-Claude Repetto <jc@repetto.org>
for translating the OSD texts to the French language
diff --git a/HISTORY b/HISTORY
index 6a3ee9f1..09698be0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -583,3 +583,6 @@ Video Disk Recorder Revision History
- Made the position of the channel display configurable (thanks to Stefan
Huelswitt).
- Made the width and height of the OSD configurable (thanks to Stefan Huelswitt).
+- DiSEqC support can now be generally enabled/disabled in the Setup menu. This
+ may be necessary if your multiswitch gets irritated by the default DiSEqC
+ codes '0' (thanks to Markus Lang).
diff --git a/MANUAL b/MANUAL
index f8b6b160..c59f3fef 100644
--- a/MANUAL
+++ b/MANUAL
@@ -326,6 +326,10 @@ Video Disk Recorder User's Manual
LnbFrequLo = 9750 The LNB's low and high local oscillator frequencies (in MHz)
LnbFrequHi = 10600 (these have no meaning for DVB-C receivers)
+ DiSEqC = 1 Generally turns DiSEqC support on or off.
+ 0 = disabled
+ 1 = enabled
+
SetSystemTime = 0 Defines whether the system time will be set according to
the time received from the DVB data stream.
0 = system time will not be set
diff --git a/config.c b/config.c
index b59bc575..8e0cce30 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.51 2001/07/27 11:27:27 kls Exp $
+ * $Id: config.c 1.52 2001/07/27 13:45:28 kls Exp $
*/
#include "config.h"
@@ -764,6 +764,7 @@ cSetup::cSetup(void)
LnbSLOF = 11700;
LnbFrequLo = 9750;
LnbFrequHi = 10600;
+ DiSEqC = 1;
SetSystemTime = 0;
MarginStart = 2;
MarginStop = 10;
@@ -793,6 +794,7 @@ bool cSetup::Parse(char *s)
else if (!strcasecmp(Name, "LnbSLOF")) LnbSLOF = atoi(Value);
else if (!strcasecmp(Name, "LnbFrequLo")) LnbFrequLo = atoi(Value);
else if (!strcasecmp(Name, "LnbFrequHi")) LnbFrequHi = atoi(Value);
+ else if (!strcasecmp(Name, "DiSEqC")) DiSEqC = atoi(Value);
else if (!strcasecmp(Name, "SetSystemTime")) SetSystemTime = atoi(Value);
else if (!strcasecmp(Name, "MarginStart")) MarginStart = atoi(Value);
else if (!strcasecmp(Name, "MarginStop")) MarginStop = atoi(Value);
@@ -857,6 +859,7 @@ bool cSetup::Save(const char *FileName)
fprintf(f, "LnbSLOF = %d\n", LnbSLOF);
fprintf(f, "LnbFrequLo = %d\n", LnbFrequLo);
fprintf(f, "LnbFrequHi = %d\n", LnbFrequHi);
+ fprintf(f, "DiSEqC = %d\n", DiSEqC);
fprintf(f, "SetSystemTime = %d\n", SetSystemTime);
fprintf(f, "MarginStart = %d\n", MarginStart);
fprintf(f, "MarginStop = %d\n", MarginStop);
diff --git a/config.h b/config.h
index 572988eb..58d03824 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.54 2001/07/27 11:28:49 kls Exp $
+ * $Id: config.h 1.55 2001/07/27 13:32:53 kls Exp $
*/
#ifndef __CONFIG_H
@@ -275,6 +275,7 @@ public:
int LnbSLOF;
int LnbFrequLo;
int LnbFrequHi;
+ int DiSEqC;
int SetSystemTime;
int MarginStart, MarginStop;
int EPGScanTimeout;
diff --git a/dvbapi.c b/dvbapi.c
index 94efe50a..4fa5589d 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbapi.c 1.89 2001/07/27 11:43:16 kls Exp $
+ * $Id: dvbapi.c 1.90 2001/07/27 13:33:56 kls Exp $
*/
#include "dvbapi.h"
@@ -2170,7 +2170,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
scmds.voltage = volt;
scmds.miniCommand = SEC_MINI_NONE;
scmds.continuousTone = tone;
- scmds.numCommands = Diseqc ? 1 : 0;
+ scmds.numCommands = Setup.DiSEqC ? 1 : 0;
scmds.commands = &scmd;
CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));
diff --git a/i18n.c b/i18n.c
index 9fb1bb93..571eea92 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: i18n.c 1.25 2001/07/27 11:30:02 kls Exp $
+ * $Id: i18n.c 1.26 2001/07/27 13:32:43 kls Exp $
*
* Slovenian translations provided by Miha Setina <mihasetina@softhome.net>
* Italian translations provided by Alberto Carraro <bertocar@tin.it>
@@ -713,6 +713,15 @@ const tPhrase Phrases[] = {
"Fréquence haute LNB",
"LO-frekvens i høybåndet",
},
+ { "DiSEqC",
+ "DiSEqC",
+ "DiSEqC",
+ "DiSEqC",
+ "DiSEqC",
+ "DiSEqC",
+ "DiSEqC",
+ "DiSEqC",
+ },
{ "SetSystemTime",
"Systemzeit stellen",
"Sistemski cas",
diff --git a/menu.c b/menu.c
index 7c51f1d5..9385dc39 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.83 2001/07/27 11:51:42 kls Exp $
+ * $Id: menu.c 1.84 2001/07/27 13:35:03 kls Exp $
*/
#include "menu.h"
@@ -1617,6 +1617,7 @@ void cMenuSetup::Set(void)
Add(new cMenuEditIntItem( tr("LnbSLOF"), &data.LnbSLOF));
Add(new cMenuEditIntItem( tr("LnbFrequLo"), &data.LnbFrequLo));
Add(new cMenuEditIntItem( tr("LnbFrequHi"), &data.LnbFrequHi));
+ Add(new cMenuEditBoolItem(tr("DiSEqC"), &data.DiSEqC));
Add(new cMenuEditBoolItem(tr("SetSystemTime"), &data.SetSystemTime));
Add(new cMenuEditIntItem( tr("MarginStart"), &data.MarginStart));
Add(new cMenuEditIntItem( tr("MarginStop"), &data.MarginStop));