From 8ab980e1d9be404a8842fad54aa9c2e34fa6f4ea Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 25 May 2003 18:00:00 +0200 Subject: Version 1.1.33 - Modified handling of audio packets in cDvbPlayer for better sync with external AC3 replay (thanks to Werner Fink). - Fixed a memory leak in cNonBlockingFileReader (thanks to Stefan Huelswitt). - Completed the French OSD texts (thanks to Gregoire Favre). - Completed the Finnish OSD texts (thanks to Niko Tarnanen and Rolf Ahrenberg). - Fixed I/O handling in case an explicit controlling terminal is given (thanks to Oliver Endriss). - Fixed resume file handling in case the resume.vdr file can't be written (thanks to Gerhard Steiner). - Fixed cutting a recording if there is only a single editing mark (thanks to Ralf Klueber for reporting this one). - Fixed volume display in case a plugin has its own OSD open (thanks to Marcel Wiesweg). - Fixed channel switching in the EPG scanner on single device systems. - Completed the Swedish OSD texts (thanks to Tomas Prybil). - Now switching to the channel used by the most recently started timer in case the original current channel becomes unavailable due to a recording on a different transponder. If this fails, a channel up/down switch is attempted as a fallback solution (thanks to Lauri Tischler for reporting this one, and to Hermann Gausterer for suggesting to switch to the recording channel). - Fixed cReplayControl::Show() to avoid a compiler warning in g++ 3.2.3 (thanks to Jan Ekholm for reporting this one). - Completed the Slovenian OSD texts (thanks to Matjaz Thaler). - Changed the DEFAULTPRIORITY in device.c to -1, so that the primary device will be used for FTA recordings in case the CAM is connected to a non-primary device (thanks to Reinhard Walter Buchner for reporting this one). - The cCiHandler now closes its file handle when it gets destroyed. - Checking for duplicate recordings with the same file name and disabling the second timer (thanks to Peter Bieringer for reporting this one). - Fixed handling newly created timers in case they are not confirmed with "Ok" (thanks to Gerhard Steiner for reporting this one). - It is now possible to directly delete a timer that is currently recording (thanks to Alexander Damhuis for reporting this one). --- menu.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'menu.h') diff --git a/menu.h b/menu.h index a404505..5dd4080 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.55 2003/05/11 13:43:58 kls Exp $ + * $Id: menu.h 1.56 2003/05/24 16:35:52 kls Exp $ */ #ifndef __MENU_H @@ -50,7 +50,7 @@ class cDisplayVolume : public cOsdObject { private: int timeout; static cDisplayVolume *displayVolume; - void Show(void); + virtual void Show(void); cDisplayVolume(void); public: virtual ~cDisplayVolume(); @@ -154,7 +154,7 @@ private: void TimeSearchDisplay(void); void TimeSearchProcess(eKeys Key); void TimeSearch(void); - void Show(int Seconds = 0); + void ShowTimed(int Seconds = 0); static char *fileName; static char *title; void DisplayAtBottom(const char *s = NULL); @@ -169,6 +169,7 @@ public: cReplayControl(void); virtual ~cReplayControl(); virtual eOSState ProcessKey(eKeys Key); + virtual void Show(void); virtual void Hide(void); bool Visible(void) { return visible; } static void SetRecording(const char *FileName, const char *Title); -- cgit v1.2.3