Version 0.90vdr-0.90

- Modified the display of the channel group separators (thanks to Markus Lang
  for this suggestion).
- Added support for replaying DVDs (thanks to Andreas Schultz). See INSTALL for
  instructions on how to compile VDR with DVD support.
- Fixed replay progress display in case replay is paused while watching an
  ongoing recording.
- Ringbuffer uses semaphores to signal empty/full conditions.
- Fixed calculating the timeout value in cFile::FileReady() (thanks to
  Wolfgang Henselmann-Weiss).

1 files changed, 26 insertions, 2 deletions

diff --git a/menu.h b/menu.h
index adc10b7..c47e5cb 100644
--- a/menu.h
+++ b/menu.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.h 1.20 2001/07/28 13:59:29 kls Exp $
+ * $Id: menu.h 1.22 2001/08/05 16:04:58 kls Exp $
  */
 
 #ifndef _MENU_H
@@ -13,17 +13,22 @@
 #define _GNU_SOURCE
 
 #include "dvbapi.h"
+#ifdef DVDSUPPORT
+#include "dvd.h"
+#endif //DVDSUPPORT
 #include "osd.h"
 #include "recording.h"
 
 class cMenuMain : public cOsdMenu {
 private:
   time_t lastActivity;
+  int digit;
+  const char *hk(const char *s);
 public:
   cMenuMain(bool Replaying);
   virtual eOSState ProcessKey(eKeys Key);
   };
-  
+
 class cDisplayChannel : public cOsdBase {
 private:
   bool withInfo, group;
@@ -39,6 +44,18 @@ public:
   virtual eOSState ProcessKey(eKeys Key);
   };
 
+#ifdef DVDSUPPORT
+class cMenuDVD : public cOsdMenu {
+private:
+  cDVD *dvd;//XXX member really necessary???
+  eOSState Play(void);
+  eOSState Eject(void);
+public:
+  cMenuDVD(void);
+  virtual eOSState ProcessKey(eKeys Key);
+  };
+#endif //DVDSUPPORT
+
 class cMenuRecordings : public cOsdMenu {
 private:
   cRecordings Recordings;
@@ -88,6 +105,10 @@ private:
   void Show(int Seconds = 0);
   void Hide(void);
   static char *fileName;
+#ifdef DVDSUPPORT
+  static cDVD *dvd;//XXX member really necessary???
+  static int titleid;//XXX
+#endif //DVDSUPPORT
   static char *title;
   bool ShowProgress(bool Initial);
   void MarkToggle(void);
@@ -101,6 +122,9 @@ public:
   virtual eOSState ProcessKey(eKeys Key);
   bool Visible(void) { return visible; }
   static void SetRecording(const char *FileName, const char *Title);
+#ifdef DVDSUPPORT
+  static void SetDVD(cDVD *DVD, int Title);//XXX
+#endif //DVDSUPPORT
   static const char *LastReplayed(void);
   static void ClearLastReplayed(const char *FileName);
   };