From 435f01649c2ee8c23c21e0680d0a39e773008549 Mon Sep 17 00:00:00 2001
From: Frank Schmirler <vdr@schmirler.de>
Date: Thu, 2 Dec 2010 09:46:57 +0100
Subject: [PATCH] Snapshot 2009-07-06

---
 HISTORY                | 4 ++++
 common.c               | 2 +-
 remux/ts2pes.h         | 4 ++--
 remux/ts2ps.h          | 6 +++---
 remux/tsremux.h        | 3 ---
 server/componentIGMP.c | 4 ++--
 server/livestreamer.h  | 1 -
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/HISTORY b/HISTORY
index 730b1e3..7752f8d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,10 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
 
+- removed redefinitions in includes - caused problems in older compilers
+- fixed ts2ps.h defines
+- fixed missing virtual for cTS2PESRemux destructor
+- silenced format mismatch warning on 64bit OS
 - added XBMC support by extending VTP capabilities (thanks to Alwin Esch)
 - now there's a common baseclass for all remuxers, make use of it
 - added cDevice::NumProvidedSystems() which was introduced in VDR 1.7.0
diff --git a/common.c b/common.c
index a31dacf..021583a 100644
--- a/common.c
+++ b/common.c
@@ -10,7 +10,7 @@
 
 using namespace std;
 
-const char *VERSION = "0.5.0-pre-20090702";
+const char *VERSION = "0.5.0-pre-20090706";
 
 const char *StreamTypes[st_Count] = {
 	"TS",
diff --git a/remux/ts2pes.h b/remux/ts2pes.h
index 61ac857..e9d7237 100644
--- a/remux/ts2pes.h
+++ b/remux/ts2pes.h
@@ -4,7 +4,7 @@
  * This file is based on a copy of remux.h from Klaus Schmidinger's
  * VDR, version 1.6.0.
  *
- * $Id: ts2pes.h,v 1.3 2009/06/30 06:04:33 schmirl Exp $
+ * $Id: ts2pes.h,v 1.4 2009/07/06 06:11:11 schmirl Exp $
  */
 
 #ifndef VDR_STREAMDEV_TS2PES_H
@@ -34,7 +34,7 @@ public:
        ///< APids, DPids and SPids are pointers to zero terminated lists of audio,
        ///< dolby and subtitle PIDs (the pointers may be NULL if there is no such
        ///< PID).
-  ~cTS2PESRemux();
+  virtual ~cTS2PESRemux();
   int Put(const uchar *Data, int Count);
        ///< Puts at most Count bytes of Data into the remuxer.
        ///< \return Returns the number of bytes actually consumed from Data.
diff --git a/remux/ts2ps.h b/remux/ts2ps.h
index 63ce992..2380c15 100644
--- a/remux/ts2ps.h
+++ b/remux/ts2ps.h
@@ -1,5 +1,5 @@
-#ifndef VDR_STREAMDEV_TS2PESREMUX_H
-#define VDR_STREAMDEV_TS2PESREMUX_H
+#ifndef VDR_STREAMDEV_TS2PSREMUX_H
+#define VDR_STREAMDEV_TS2PSREMUX_H
 
 #include "remux/tsremux.h"
 #include "server/streamer.h"
@@ -33,4 +33,4 @@ public:
 
 } // namespace Streamdev
 
-#endif // VDR_STREAMDEV_TS2PESREMUX_H
+#endif // VDR_STREAMDEV_TS2PSREMUX_H
diff --git a/remux/tsremux.h b/remux/tsremux.h
index dbcb9ff..dbcd5de 100644
--- a/remux/tsremux.h
+++ b/remux/tsremux.h
@@ -6,9 +6,6 @@
 
 // Picture types:
 #define NO_PICTURE 0
-#define I_FRAME    1
-#define P_FRAME    2
-#define B_FRAME    3
 
 namespace Streamdev {
 
diff --git a/server/componentIGMP.c b/server/componentIGMP.c
index 946c513..d9f8811 100644
--- a/server/componentIGMP.c
+++ b/server/componentIGMP.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: componentIGMP.c,v 1.1 2009/02/13 10:39:22 schmirl Exp $
+ *  $Id: componentIGMP.c,v 1.2 2009/07/03 21:44:19 schmirl Exp $
  */
 #include <netinet/ip.h>
 #include <netinet/igmp.h>
@@ -209,7 +209,7 @@ cServerConnection* cComponentIGMP::Accept(void)
 	igmp->igmp_cksum = 0;
 	if (chksum != inetChecksum((uint16_t *)igmp, ip_datalen))
 	{
-		esyslog("INVALID CHECKSUM %d %d %d %d 0x%x 0x%x", ntohs(ip->ip_len), ip_hdrlen, ip_datalen, recv_len, chksum, inetChecksum((uint16_t *)igmp, ip_datalen));
+		esyslog("INVALID CHECKSUM %d %d %d %lu 0x%x 0x%x", (int) ntohs(ip->ip_len), ip_hdrlen, ip_datalen, (unsigned long int) recv_len, chksum, inetChecksum((uint16_t *)igmp, ip_datalen));
 		return NULL;
 	}
 	logIGMP(igmp->igmp_type, ip->ip_src, ip->ip_dst, igmp->igmp_group);
diff --git a/server/livestreamer.h b/server/livestreamer.h
index 7f442ba..92448bb 100644
--- a/server/livestreamer.h
+++ b/server/livestreamer.h
@@ -5,7 +5,6 @@
 #include <vdr/receiver.h>
 
 #include "server/streamer.h"
-#include "remux/tsremux.h"
 #include "common.h"
 
 namespace Streamdev {