Version 0.85vdr-0.85

- Added Norwegian language texts (thanks to Jørgen Tvedt).
- Increased the usleep value in cDvbOsd::Cmd() to 5000 in order to work on
  systems with the KURT/utime-patch (thanks to Guido Fiala).
- Changed the check whether the driver is loaded in runvdr to check for the
  'dvb' module (the last one loaded).
- Fixed repeat function with LIRC (thanks to Stefan Huelswitt).
- Increased the upper limit for the symbol rate to 30000 (thanks to Ulrich
  Röder).
- 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).
- Fixed replaying in case there is no index file.
- Fixed jumping to an editing mark when replay has been paused.
- Avoiding unnecessary code execution in the replay progress display (thanks
  to Guido Fiala).
- When entering time values the digits that still have to be entered are now
  shown as '-' (as in "1-:--").
- When setting an editing mark while the progress display is not active, the
  display will now be turned on for a short while to indicate the successful
  setting of the mark.
- Updated 'channels.conf' for Premiere World (thanks to Helmut Schächner).
  Check your timers if you use this channels.conf file, since the sequence of
  several PW channels has been changed.
- Changed the color of "Info" messages to "black on green" and that of the
  confirmation messages (like "Delete...") to "black on yellow".
- Fixed display with DEBUG_OSD (it still crashes sometimes, esp. when replaying,
  but I can't seem to find what causes this... any ideas anybody?).
- Avoiding audio/video distortions in 'Transfer Mode' by no longer actually
  tuning the primary interface (which can't receive this channel, anyway).
  Apparently the driver gets irritated when the channel is switched and a
  replay session is started immediately after that.
- Increased timeout until reporting "video data stream broken" when recording.
- Explicitly switching back to the previously active channel after ending a
  replay session (to have it shown correctly in case it was in 'Transfer Mode').

1 files changed, 19 insertions, 7 deletions

diff --git a/config.h b/config.h
index 6c21fb2..58d0382 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.44 2001/04/01 14:44:40 kls Exp $
+ * $Id: config.h 1.55 2001/07/27 13:32:53 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,10 +19,18 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "0.72"
+#define VDRVERSION "0.85"
 
 #define MaxBuffer 10000
 
+#define MAXPRIORITY 99
+#define MAXLIFETIME 99
+
+#define MINOSDWIDTH  40
+#define MAXOSDWIDTH  56
+#define MINOSDHEIGHT 12
+#define MAXOSDHEIGHT 21
+
 enum eKeys { // "Up" and "Down" must be the first two keys!
              kUp,
              kDown,
@@ -92,7 +100,8 @@ public:
   int diseqc;
   int srate;
   int vpid;
-  int apid;
+  int apid1, apid2;
+  int dpid1, dpid2;
   int tpid;
   int ca;
   int pnr;
@@ -106,9 +115,6 @@ public:
   bool Switch(cDvbApi *DvbApi = NULL, bool Log = true);
   };
 
-#define DEFAULTPRIORITY 99
-#define DEFAULTLIFETIME 99
-
 class cTimer : public cListObject {
 private:
   time_t startTime, stopTime;
@@ -240,7 +246,7 @@ public:
   bool SwitchTo(int Number, cDvbApi *DvbApi = NULL);
   int MaxNumber(void) { return maxNumber; }
   };
- 
+
 class cTimers : public cConfig<cTimer> {
 public:
   cTimer *GetTimer(cTimer *Timer);
@@ -266,13 +272,19 @@ public:
   int ShowInfoOnChSwitch;
   int MenuScrollPage;
   int MarkInstantRecord;
+  int LnbSLOF;
   int LnbFrequLo;
   int LnbFrequHi;
+  int DiSEqC;
   int SetSystemTime;
   int MarginStart, MarginStop;
   int EPGScanTimeout;
   int SVDRPTimeout;
   int PrimaryLimit;
+  int DefaultPriority, DefaultLifetime;
+  int VideoFormat;
+  int ChannelInfoPos;
+  int OSDwidth, OSDheight;
   int CurrentChannel;
   cSetup(void);
   bool Load(const char *FileName);