diff options
author | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2002-07-21 18:00:00 +0200 |
---|---|---|
committer | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2002-07-21 18:00:00 +0200 |
commit | a4112a96a67dbeb1cd6a63d2b4fa4b837462f467 (patch) | |
tree | 5542f0478dbba7715da703b2864fbfda640d6612 /osd.h | |
parent | 54d069c95c546d6b12f6effc1af7a0274b7c31e4 (diff) | |
download | vdr-patch-lnbsharing-a4112a96a67dbeb1cd6a63d2b4fa4b837462f467.tar.gz vdr-patch-lnbsharing-a4112a96a67dbeb1cd6a63d2b4fa4b837462f467.tar.bz2 |
Version 1.1.5vdr-1.1.5
- Added direct access to the index data of cPalette (needed for displaying SPUs,
thanks to Andreas Schultz).
- The status monitor function cStatus::Replaying() now gets a 'cControl *' argument instead
of a 'cDvbPlayerControl *' in order to allow additional players to call this function.
cPlayer and cControl have been given the functions GetIndex() and GetReplayMode() to
allow access to the player's status.
- Added cOsd::OpenRaw() to create a raw OSD (needed for displaying SPUs).
- Changed the symantics of the Name parameter in cStatus::Recording() and
cStatus::Replaying(). It is no longer the full directory name of the recording,
but rather just the basic name. This has been changed to allow players that can't
provide a name to simply use a string that describes the player type (like, e.g.,
"DVD").
- Fixed a hangup when switching to the next file during replay.
- Fixed a possible race condition in the cDvbPlayer (thanks to Andreas Schultz
for pointing out this one).
- Disabled channels on Transponder 12070 in 'channels.conf', which apparently no longer transmits.
Diffstat (limited to 'osd.h')
-rw-r--r-- | osd.h | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.h 1.32 2002/06/23 09:13:17 kls Exp $ + * $Id: osd.h 1.33 2002/07/13 12:47:06 kls Exp $ */ #ifndef __OSD_H @@ -14,7 +14,7 @@ #include <ncurses.h> #endif #include "config.h" -#include "dvbosd.h" +#include "osdbase.h" #include "interface.h" #include "osdbase.h" #include "tools.h" @@ -62,12 +62,16 @@ private: static int colorPairs[MaxColorPairs]; static void SetColor(eDvbColor colorFg, eDvbColor colorBg = clrBackground); #else - static cDvbOsd *osd; + static cOsdBase *osd; #endif static int cols, rows; public: static void Initialize(void); static void Shutdown(void); + static cOsdBase *OpenRaw(int x, int y); + // Returns a raw OSD without any predefined windows or colors. + // If the "normal" OSD is currently in use, NULL will be returned. + // The caller must delete this object before the "normal" OSD is used again! static void Open(int w, int h); static void Close(void); static void Clear(void); |