diff options
| -rw-r--r-- | equalizer.c | 6 | ||||
| -rw-r--r-- | osd.c | 16 | ||||
| -rw-r--r-- | osd.h | 8 | ||||
| -rw-r--r-- | setup_menu.c | 10 |
4 files changed, 34 insertions, 6 deletions
diff --git a/equalizer.c b/equalizer.c index 9a957cdd..4114b497 100644 --- a/equalizer.c +++ b/equalizer.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: equalizer.c,v 1.2 2006-08-22 03:45:34 phintuka Exp $ + * $Id: equalizer.c,v 1.3 2007-09-01 08:47:04 phintuka Exp $ * */ @@ -46,7 +46,11 @@ void cEqualizer::Show() { tArea areas [] = { {0, 0, OSD_W - 1, OSD_H - 1, 4} }; +#if VDRVERSNUM >= 10509 + m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0); +#else m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y); +#endif if(m_Osd) { if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) { @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: osd.c,v 1.7 2007-03-14 17:51:01 phintuka Exp $ + * $Id: osd.c,v 1.8 2007-09-01 08:47:04 phintuka Exp $ * */ @@ -148,8 +148,12 @@ static inline void RleCmd(cXinelibDevice *Device, int wnd, } } -cXinelibOsd::cXinelibOsd(cXinelibDevice *Device, int x, int y) +cXinelibOsd::cXinelibOsd(cXinelibDevice *Device, int x, int y, uint Level) +#if VDRVERSNUM >= 10509 + : cOsd(x, y, Level), m_IsVisible(true) +#else : cOsd(x, y), m_IsVisible(true) +#endif { TRACEF("cXinelibOsd::cXinelibOsd"); @@ -341,7 +345,11 @@ cXinelibOsdProvider::~cXinelibOsdProvider() } } +#if VDRVERSNUM >= 10509 +cOsd *cXinelibOsdProvider::CreateOsd(int Left, int Top, uint Level) +#else cOsd *cXinelibOsdProvider::CreateOsd(int Left, int Top) +#endif { TRACEF("cXinelibOsdProvider::CreateOsd"); @@ -350,7 +358,11 @@ cOsd *cXinelibOsdProvider::CreateOsd(int Left, int Top) if(cXinelibOsd::m_OsdStack.First()) LOGMSG("cXinelibOsdProvider::CreateOsd - OSD already open !"); +#if VDRVERSNUM >= 10509 + cXinelibOsd *m_OsdInstance = new cXinelibOsd(m_Device, Left, Top, Level); +#else cXinelibOsd *m_OsdInstance = new cXinelibOsd(m_Device, Left, Top); +#endif if(cXinelibOsd::m_OsdStack.First()) cXinelibOsd::m_OsdStack.First()->Hide(); @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: osd.h,v 1.3 2006-10-23 20:09:04 phintuka Exp $ + * $Id: osd.h,v 1.4 2007-09-01 08:47:04 phintuka Exp $ * */ @@ -45,7 +45,7 @@ class cXinelibOsd : public cOsd, public cListObject friend class cXinelibOsdProvider; public: - cXinelibOsd(cXinelibDevice *Device, int x, int y); + cXinelibOsd(cXinelibDevice *Device, int x, int y, uint Level = 0); virtual ~cXinelibOsd(); }; @@ -59,7 +59,11 @@ class cXinelibOsdProvider : public cOsdProvider cXinelibOsdProvider(cXinelibDevice *Device); virtual ~cXinelibOsdProvider(); +#if VDRVERSNUM >= 10509 + virtual cOsd *CreateOsd(int Left, int Top, uint Level); +#else virtual cOsd *CreateOsd(int Left, int Top); +#endif static void RefreshOsd(void); }; diff --git a/setup_menu.c b/setup_menu.c index 77a2ea28..7f77046a 100644 --- a/setup_menu.c +++ b/setup_menu.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: setup_menu.c,v 1.34 2007-06-19 06:06:22 phintuka Exp $ + * $Id: setup_menu.c,v 1.35 2007-09-01 08:47:04 phintuka Exp $ * */ @@ -1537,7 +1537,11 @@ void cTestGrayscale::Show() int i; if(!m_Osd) +#if VDRVERSNUM >= 10509 + m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0); +#else m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y); +#endif if(m_Osd) { if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) { @@ -1636,7 +1640,11 @@ void cTestBitmap::Show() int x, y, bit = 0; if(!m_Osd) { +#if VDRVERSNUM >= 10509 + m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y, 0); +#else m_Osd = cOsdProvider::NewOsd(OSD_X, OSD_Y); +#endif if(m_Osd) { if (m_Osd->CanHandleAreas(areas, sizeof(areas) / sizeof(tArea) ) == oeOk) { |