fix changed DVB defines in VDR 1.7.23+

diff --git a/device.c b/device.c
index 2d7eac3f6582fae3ab4f102a3243b71d765b698a..04bbef1954fd9a0825602fa83dbe262f8478ac11 100644 (file)
--- 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 b3f938e1b37a3da9d39bdadabb866b7ae9f634ed..c251f5d006b43f57e0829f79464873bdf0030ac2 100644 (file)
--- 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