Version 0.99pre2vdr-0.99pre2

- Fixed setting the OSD size in the 'Confirm' interface call (thanks to
  Deti Fliegl).
- Removed the 'read incomplete section...' error message in the EIT processor.
- Fixed channel data for "DW TV" (thanks to Axel Gruber).
- Added DPID to "PREMIERE MOVIE 1" in channels.conf.cable (thanks to Stephan
  Schreiber).
- Prepared the OSD functions for multiple overlapping windows.
- Removed the check to see whether the system time is running linearly.
- Improved performance of SVDRP command entry.
- Removed EPGBugfixLevel '3' - after more than a year Pro-7 finally managed to
  broadcast the correct timestamps for EPG events between 0:00 and 6:00!
- Fixed failing watchdog timer if program hangs in OSD activities (thanks to
  Carsten Koch).
- No longer requiring 'libncurses' if compiling without DEBUG_OSD=1 and
  REMOTE=KBD (thanks to Lauri Pesonen).
- The "Recordings" menu now displays a hierarchical structure if there are
  subdirectories for the recordings. This can be controlled through the
  "RecordingDirs" parameter in the "Setup" menu.
  See "MANUAL/Replaying a Recording" for details.
- Improved speed of setting the Help button texts.
- Fixed handling file names that contain single quotes (') or dollar signs ($)
  in the call to the shutdown command (option '-s') and the recording command
  (option '-r').
- Improved error handling in the editing process; the resulting file will be
  deleted if an error occured.
- A message is now prompted at the end of the editing process, indicating
  whether the process succeeded or failed.
- Fixed setting the LastActivity timestamp after a shutdown prompt (thanks to
  Sergei Haller).
- A message is now prompted if free disk space becomes low during recording.
- The editing process now calls AssertFreeDiskSpace() to remove deleted
  recordings if the disk becomes full.
- The "Main" menu now displays in its title the used disk space (in percent)
  and the estimated free disk space (in hh:mm), assuming a data rate of 30 MB
  per minute.
- Activating the "Recordings" menu now displays "scanning recordings..." to
  give the user some feedback in case this takes longer.
- Status messages are now displayed centered.
- Removed the 'Tools' subdirectory from the VDR archive. All contributed tools
  can now be found at ftp://ftp.cadsoft.de/pub/people/kls/vdr/Tools.

1 files changed, 11 insertions, 4 deletions

diff --git a/osd.c b/osd.c
index 02f4374..0a825d7 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 1.18 2001/08/25 13:15:16 kls Exp $
+ * $Id: osd.c 1.20 2002/01/26 11:09:58 kls Exp $
  */
 
 #include "osd.h"
@@ -127,9 +127,7 @@ void cOsdMenu::SetHelp(const char *Red, const char *Green, const char *Yellow, c
   helpYellow = Yellow;
   helpBlue   = Blue;
   if (visible)
-     Display();
-     //XXX Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
-     //XXX must clear unused button areas!
+     Interface->Help(helpRed, helpGreen, helpYellow, helpBlue);
 }
 
 void cOsdMenu::Del(int Index)
@@ -150,6 +148,10 @@ void cOsdMenu::Add(cOsdItem *Item, bool Current)
 
 void cOsdMenu::Display(void)
 {
+  if (subMenu) {
+     subMenu->Display();
+     return;
+     }
   visible = true;
   Interface->Clear();
   Interface->SetCols(cols);
@@ -179,6 +181,11 @@ void cOsdMenu::Display(void)
      Interface->Status(status);
 }
 
+void cOsdMenu::SetCurrent(cOsdItem *Item)
+{
+  current = Item ? Item->Index() : -1;
+}
+
 void cOsdMenu::RefreshCurrent(void)
 {
   cOsdItem *item = Get(current);