diff options
Diffstat (limited to 'PLUGINS')
-rw-r--r-- | PLUGINS/src/osddemo/HISTORY | 4 | ||||
-rw-r--r-- | PLUGINS/src/osddemo/osddemo.c | 22 | ||||
-rw-r--r-- | PLUGINS/src/sky/channels.conf.sky | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY index c7d4ebc..fd10cc3 100644 --- a/PLUGINS/src/osddemo/HISTORY +++ b/PLUGINS/src/osddemo/HISTORY @@ -8,3 +8,7 @@ VDR Plugin 'osddemo' Revision History 2002-12-13: Version 0.1.0 - Changed setting of CXX and CXXFLAGS variables in Makefile. + +2004-04-30: Version 0.1.1 + +- New OSD handling. diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c index 3ac8a2d..08b2d96 100644 --- a/PLUGINS/src/osddemo/osddemo.c +++ b/PLUGINS/src/osddemo/osddemo.c @@ -3,12 +3,12 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: osddemo.c 1.2 2002/12/13 15:02:01 kls Exp $ + * $Id: osddemo.c 1.3 2004/05/16 09:28:51 kls Exp $ */ #include <vdr/plugin.h> -static const char *VERSION = "0.1.0"; +static const char *VERSION = "0.1.1"; static const char *DESCRIPTION = "Demo of arbitrary OSD setup"; static const char *MAINMENUENTRY = "Osd Demo"; @@ -16,10 +16,10 @@ static const char *MAINMENUENTRY = "Osd Demo"; class cLineGame : public cOsdObject { private: - cOsdBase *osd; + cOsd *osd; int x; int y; - eDvbColor color; + tColor color; public: cLineGame(void); ~cLineGame(); @@ -41,15 +41,11 @@ cLineGame::~cLineGame() void cLineGame::Show(void) { - osd = cOsd::OpenRaw(100, 50); + osd = cOsdProvider::NewOsd(100, 50); if (osd) { - osd->Create(0, 0, 100, 200, 4); - osd->AddColor(clrBackground); - osd->AddColor(clrRed); - osd->AddColor(clrGreen); - osd->AddColor(clrYellow); - osd->AddColor(clrBlue); - osd->Clear(); + tArea Area = { 0, 0, 99, 199, 4 }; + osd->SetAreas(&Area, 1); + osd->DrawRectangle(0, 0, 99, 199, clrGray50); osd->Flush(); } } @@ -70,7 +66,7 @@ eOSState cLineGame::ProcessKey(eKeys Key) case kOk: return osEnd; default: return state; } - osd->Fill(x, y, x + 3, y + 3, color); + osd->DrawRectangle(x, y, x + 3, y + 3, color); osd->Flush(); state = osContinue; } diff --git a/PLUGINS/src/sky/channels.conf.sky b/PLUGINS/src/sky/channels.conf.sky index ba262f8..4b6e1af 100644 --- a/PLUGINS/src/sky/channels.conf.sky +++ b/PLUGINS/src/sky/channels.conf.sky @@ -18,7 +18,7 @@ # S28.2E-2-2027-4705:106:sky_one S28.2E-2-2027-5104:107:sky_one_mix -S28.2E-2-2054-10240:226:itv2 +S28.2E-2-2054-10240:175:itv2 S28.2E-2-2023-4905:130:scifi S28.2E-2-2025-5904:127:paramount S28.2E-2-2009-6201:551:discovery |