diff options
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | MANUAL | 4 | ||||
| -rw-r--r-- | config.c | 5 | ||||
| -rw-r--r-- | config.h | 3 | ||||
| -rw-r--r-- | dvbapi.c | 4 | ||||
| -rw-r--r-- | i18n.c | 11 | ||||
| -rw-r--r-- | menu.c | 3 |
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 @@ -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). @@ -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 @@ -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); @@ -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; @@ -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)); @@ -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", @@ -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)); |