summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzwer <zwer@1f4bef6d-8e0a-0410-8695-e467da8aaccf>2008-09-04 20:16:47 +0000
committerzwer <zwer@1f4bef6d-8e0a-0410-8695-e467da8aaccf>2008-09-04 20:16:47 +0000
commitdf5f5691179c541b4e7c65e85754f4581487c61e (patch)
treefd971925a63379a2078c849008f79f7db0bf57c0
parent7205f4b14f1b472625aeede98505e063c793e633 (diff)
downloadvdr-plugin-ffnetdev-df5f5691179c541b4e7c65e85754f4581487c61e.tar.gz
vdr-plugin-ffnetdev-df5f5691179c541b4e7c65e85754f4581487c61e.tar.bz2
Lauffähg unter VDR 1.6.0 gemacht
git-svn-id: svn://svn.berlios.de/ffnetdev/trunk@34 1f4bef6d-8e0a-0410-8695-e467da8aaccf
-rw-r--r--ffnetdev.c4
-rw-r--r--netosd.c2
-rw-r--r--netosd.h4
-rw-r--r--remote.c2
-rw-r--r--remote.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/ffnetdev.c b/ffnetdev.c
index e2f0980..5705d6c 100644
--- a/ffnetdev.c
+++ b/ffnetdev.c
@@ -33,10 +33,10 @@ cNetOSDProvider::cNetOSDProvider(void)
}
-cOsd * cNetOSDProvider::CreateOsd(int Left, int Top)
+cOsd * cNetOSDProvider::CreateOsd(int Left, int Top, uint Level)
{
- osd = new cNetOSD(Left, Top);
+ osd = new cNetOSD(Left, Top, Level);
return osd;
}
diff --git a/netosd.c b/netosd.c
index 641a409..025fcdf 100644
--- a/netosd.c
+++ b/netosd.c
@@ -9,7 +9,7 @@
#include "osdworker.h"
//////////////////////////////////////////////////////////////////////////////////////////////////
-cNetOSD::cNetOSD(int Left, int Top) : cOsd(Left, Top)
+cNetOSD::cNetOSD(int XOfs, int YOfs, uint Level) : cOsd(XOfs, YOfs, Level)
{
#ifdef DEBUG
fprintf(stderr,"[ffnetdev] NetOSD: Constructor cNetOSD.\n");
diff --git a/netosd.h b/netosd.h
index 1657d5e..857087b 100644
--- a/netosd.h
+++ b/netosd.h
@@ -17,7 +17,7 @@ private:
bool truecolor;
protected:
public:
- cNetOSD(int XOfs, int XOfs);
+ cNetOSD(int XOfs, int YOfs, uint Level = OSD_LEVEL_DEFAULT);
virtual ~cNetOSD();
virtual eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
virtual void Flush(void);
@@ -31,7 +31,7 @@ private:
cNetOSD **NetOSD;
public:
cNetOSDProvider(void);
- virtual cOsd *CreateOsd(int Left, int Top);
+ virtual cOsd *CreateOsd(int Left, int Top, uint Level);
};
#endif //_NETOSD__H
diff --git a/remote.c b/remote.c
index dbfd0ac..cce1392 100644
--- a/remote.c
+++ b/remote.c
@@ -27,7 +27,7 @@ bool cMyRemote::Initialize(void)
return true;
}
-bool cMyRemote::Put(uint64 Code, bool Repeat, bool Release)
+bool cMyRemote::Put(uint64_t Code, bool Repeat, bool Release)
{
#if VDRVERSNUM >= 10347
if ((cRemote::IsLearning()) && (Release))
diff --git a/remote.h b/remote.h
index b3717b3..17b8d8c 100644
--- a/remote.h
+++ b/remote.h
@@ -17,7 +17,7 @@ public:
cMyRemote(const char *Name);
virtual bool Initialize(void);
virtual bool Ready(void);
- virtual bool Put(uint64 Code, bool Repeat, bool Release);
+ virtual bool Put(uint64_t Code, bool Repeat, bool Release);
};