summaryrefslogtreecommitdiff
path: root/dvbdevice.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-10-04 12:44:13 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-10-04 12:44:13 +0200
commit612f696bb7fc3d28ed24afd3d8782a6e7a961366 (patch)
tree3643caba670e36d0bf7261cc139a3ef7a1e42b40 /dvbdevice.c
parent1e9b16d20bacb9795a07af5ff61db67fc78c3728 (diff)
downloadvdr-612f696bb7fc3d28ed24afd3d8782a6e7a961366.tar.gz
vdr-612f696bb7fc3d28ed24afd3d8782a6e7a961366.tar.bz2
Changed DTV_DVBT2_PLP_ID to DTV_STREAM_ID in dvbdevice.c to adapt to an incompatible change in DVB API 5.8
Diffstat (limited to 'dvbdevice.c')
-rw-r--r--dvbdevice.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/dvbdevice.c b/dvbdevice.c
index a7635b23..0ea7a2e3 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 2.72 2012/09/22 11:53:57 kls Exp $
+ * $Id: dvbdevice.c 2.73 2012/10/04 12:44:13 kls Exp $
*/
#include "dvbdevice.h"
@@ -21,7 +21,9 @@
#include "menuitems.h"
#include "sourceparams.h"
-#define FE_CAN_TURBO_FEC 0x8000000 // TODO: remove this once it is defined in the driver
+#if (DVB_API_VERSION << 8 | DVB_API_VERSION_MINOR) < 0x0508
+#define DTV_STREAM_ID DTV_DVBT2_PLP_ID
+#endif
#define DVBS_TUNE_TIMEOUT 9000 //ms
#define DVBS_LOCK_TIMEOUT 2000 //ms
@@ -810,7 +812,7 @@ bool cDvbTuner::SetFrontend(void)
SETCMD(DTV_HIERARCHY, dtp.Hierarchy());
if (frontendType == SYS_DVBT2) {
// DVB-T2
- SETCMD(DTV_DVBT2_PLP_ID, dtp.PlpId());
+ SETCMD(DTV_STREAM_ID, dtp.PlpId());
}
tuneTimeout = DVBT_TUNE_TIMEOUT;