Release version 0.0.7.1v0.0.7.1

- adapted to VDR 1.3.18+ (should work with older versions, too)

5 files changed, 11 insertions, 3 deletions

diff --git a/00-DEVELOPMENT b/00-DEVELOPMENT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/00-DEVELOPMENT
diff --git a/Makefile b/Makefile
index cf23716..872b842 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 2004/11/19 16:45:31 lordjaxom Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
diff --git a/osd.c b/osd.c
index 19dc43d..e7e2ca0 100644
--- a/osd.c
+++ b/osd.c
@@ -697,7 +697,7 @@ void cOsdPipObject::ShowChannelInfo(const cChannel * channel, bool show)
 			if ((present = schedule->GetPresentEvent()) != NULL) {
 				presentTitle = present->Title();
 				if (!isempty(presentTitle)) {
-					sprintf(line2, "%s %s", present->GetTimeString(), presentTitle);
+					sprintf(line2, "%s %s", (const char*)present->GetTimeString(), presentTitle);
 #if VDRVERSNUM < 10307
 					while (m_Osd->Width(line2) > OsdPipSetup.InfoWidth - 10) {
 						line2[strlen(line2) - 1] = 0;
diff --git a/osdpip.c b/osdpip.c
index 83bf4b6..f49008f 100644
--- a/osdpip.c
+++ b/osdpip.c
@@ -19,7 +19,7 @@ extern "C"
 
 #include <vdr/plugin.h>
 
-static const char *VERSION        = "0.0.7";
+static const char *VERSION        = "0.0.7.1";
 static const char *DESCRIPTION    = "OSD Picture-in-Picture";
 static const char *MAINMENUENTRY  = "Picture-in-Picture";
 
diff --git a/receiver.c b/receiver.c
index 9fe9e8d..a1aaf9d 100644
--- a/receiver.c
+++ b/receiver.c
@@ -14,14 +14,22 @@
 
 cOsdPipReceiver::cOsdPipReceiver(const cChannel *Channel, 
 	cRingBufferFrame *ESBuffer):
+#if VDRVERSNUM >= 10318
+	cReceiver(Channel->Ca(), 0, 2, Channel->Vpid(), Channel->Apid(0))
+#else
 	cReceiver(Channel->Ca(), 0, 2, Channel->Vpid(), Channel->Apid1())
+#endif
 {
 	m_TSBuffer = new cRingBufferLinear(MEGABYTE(3), TS_SIZE * 2, true);
 #if VDRVERSNUM >= 10313
 	m_TSBuffer->SetTimeouts(0, 100);
 #endif
 	m_ESBuffer = ESBuffer;
+#if VDRVERSNUM >= 10318
+	m_Remux = new cRemux(Channel->Vpid(), Channel->Apid(0), 0, 0, 0, true);
+#else
 	m_Remux = new cRemux(Channel->Vpid(), Channel->Apid1(), 0, 0, 0, true);
+#endif
 	m_Active = false;
 }