Fixes for compilation against VDR 1.7.27. It compiles!

diff --git a/.gitignore b/.gitignore
index 100f728286914efa2a6cf6807f54046361ffba6e..7b2801eaeccc15e8288dff989c155adb914d54d4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.o
 .dependencies
 *~
+libvdr-vompserver.so

diff --git a/Makefile b/Makefile
index ef3e4af3b745f1e86852bedac7fc36e794cd56c2..aa810645a37cda4746bbcca0e206c877bbb956cf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -110,5 +110,5 @@ dist: clean
        @echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-       rm -f $(OBJS) $(OBJS2) $(DEPFILE) libvdr*.so.* *.tgz core* *~ .standalone vompserver-standalone
+       rm -f $(OBJS) $(OBJS2) $(DEPFILE) libvdr*.so* *.tgz core* *~ .standalone vompserver-standalone
 

diff --git a/mediafile.c b/mediafile.c
index 0138cc36f692da7e6187588b6ec050dce164bd02..93bbfcad139b7f7fe2e435047fca6f06d5c5ac50 100644 (file)
--- a/mediafile.c
+++ b/mediafile.c
@@ -18,16 +18,16 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include "mediafile.h"
-#include "media.h"
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <iostream>
-#include "log.h"
-
+#include <stddef.h>
 
+#include "mediafile.h"
+#include "media.h"
+#include "log.h"
 
 
 MediaFile::MediaFile(ULONG pid){
@@ -85,7 +85,8 @@ ULONG MediaFile::getMediaType(const char * filename) {
 Media * MediaFile::createMedia(const char * dirname, const char * filename, bool withURI) {
   Media * rt=NULL;
   char *buffer;
-  asprintf(&buffer, "%s/%s", dirname, filename);
+  int blen = asprintf(&buffer, "%s/%s", dirname, filename);
+  if (blen); // keep compiler happy because of unused result and unread variable warnings
   struct stat st;
   ULONG mtype=MEDIA_TYPE_UNKNOWN;
   if (stat(buffer, &st) == 0) {

diff --git a/mvpreceiver.c b/mvpreceiver.c
index 1fce336bd9d39b53f6410929d2dd6b3567b49ff0..49028b5b76c39b59dc5db76b412366f90838064a 100644 (file)
--- a/mvpreceiver.c
+++ b/mvpreceiver.c
@@ -39,8 +39,10 @@ MVPReceiver::MVPReceiver(cChannel* channel, cDevice* device)
 : cReceiver(channel->Ca(), 0, 7, channel->Vpid(), channel->Ppid(), channel->Apid1(), channel->Apid2(), channel->Dpid1(), channel->Dpid2(), channel->Tpid())
 #elif VDRVERSNUM < 10500
 : cReceiver(channel->Ca(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
-#else
+#elif VDRVERSNUM < 10712
 : cReceiver(channel->GetChannelID(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
+#else
+: cReceiver(channel, 0)
 #endif
 {
   logger = Log::getInstance();