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, 14 insertions, 8 deletions

diff --git a/interface.c b/interface.c
index 55cdb0b..03dca06 100644
--- a/interface.c
+++ b/interface.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: interface.c 1.35 2001/02/18 10:46:13 kls Exp $
+ * $Id: interface.c 1.39 2001/07/28 14:57:52 kls Exp $
  */
 
 #include "interface.h"
@@ -44,8 +44,13 @@ cInterface::~cInterface()
 
 void cInterface::Open(int NumCols, int NumLines)
 {
-  if (!open++)
+  if (!open++) {
+     if (NumCols == 0)
+        NumCols = Setup.OSDwidth;
+     if (NumLines == 0)
+        NumLines = Setup.OSDheight;
      cDvbApi::PrimaryDvbApi->Open(width = NumCols, height = NumLines);
+     }
 }
 
 void cInterface::Close(void)
@@ -281,16 +286,17 @@ void cInterface::Title(const char *s)
 
 void cInterface::Status(const char *s, eDvbColor FgColor, eDvbColor BgColor)
 {
-  ClearEol(0, -3, s ? BgColor : clrBackground);
+  int Line = (abs(height) == 1) ? 0 : -2;
+  ClearEol(0, Line, s ? BgColor : clrBackground);
   if (s)
-     Write(0, -3, s, FgColor, BgColor);
+     Write(0, Line, s, FgColor, BgColor);
 }
 
 void cInterface::Info(const char *s)
 {
-  Open();
+  Open(Setup.OSDwidth, -1);
   isyslog(LOG_INFO, "info: %s", s);
-  Status(s, clrWhite, clrGreen);
+  Status(s, clrBlack, clrGreen);
   Wait();
   Status(NULL);
   Close();
@@ -298,7 +304,7 @@ void cInterface::Info(const char *s)
 
 void cInterface::Error(const char *s)
 {
-  Open();
+  Open(Setup.OSDwidth, -1);
   esyslog(LOG_ERR, "ERROR: %s", s);
   Status(s, clrWhite, clrRed);
   Wait();
@@ -310,7 +316,7 @@ bool cInterface::Confirm(const char *s)
 {
   Open();
   isyslog(LOG_INFO, "confirm: %s", s);
-  Status(s, clrBlack, clrGreen);
+  Status(s, clrBlack, clrYellow);
   bool result = Wait(10) == kOk;
   Status(NULL);
   Close();