From: leslie <unknown>
Date: Sun, 6 May 2012 14:50:52 +0000 (+0200)
Subject: fix changed DVB defines in VDR 1.7.23+
X-Git-Tag: upstream/620~8
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=6d8f7a01ecbb7986aed89f4190f2397ab6f0315b;p=sasc-ng.git

fix changed DVB defines in VDR 1.7.23+
---

diff --git a/device.c b/device.c
index 2d7eac3..04bbef1 100644
--- a/device.c
+++ b/device.c
@@ -287,7 +287,7 @@ int cScDevices::budget=0;
 
 void cScDevices::DvbName(const char *Name, int a, int f, char *buffer, int len)
 {
-  snprintf(buffer,len,"%s%d/%s%d",DEV_DVB_ADAPTER,a,Name,f);
+  snprintf(buffer,len,"%s/%s%d/%s%d",DEV_DVB_BASE,DEV_DVB_ADAPTER,a,Name,f);
 }
 
 int cScDevices::DvbOpen(const char *Name, int a, int f, int Mode, bool ReportError)
diff --git a/device.h b/device.h
index b3f938e..c251f5d 100644
--- a/device.h
+++ b/device.h
@@ -29,14 +29,15 @@ class cDeCSA;
 
 // ----------------------------------------------------------------
 
-#ifndef DEV_DVB_ADAPTER
-#define DEV_DVB_ADAPTER  "/dev/dvb/adapter"
-#endif
+#if APIVERSNUM < 10723
+#define DEV_DVB_BASE     "/dev/dvb"
+#define DEV_DVB_ADAPTER  "adapter"
 #define DEV_DVB_FRONTEND "frontend"
 #define DEV_DVB_DVR      "dvr"
 #define DEV_DVB_DEMUX    "demux"
 #define DEV_DVB_CA       "ca"
 #define DEV_DVB_OSD      "osd"
+#endif
 
 #if APIVERSNUM >= 10711
 #define DVB_DEV_SPEC adapter,frontend