From d1ea5ca06d13df24e5b0d7bf8c361425a2174832 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 6 Jan 2009 14:52:54 +0100 Subject: cDvbDevice now uses the FE_CAN_2G_MODULATION flag --- HISTORY | 3 +++ dvbdevice.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 94f22ff7..68bdc338 100644 --- a/HISTORY +++ b/HISTORY @@ -5908,3 +5908,6 @@ Video Disk Recorder Revision History If the output device needs this, it has to take care of it by itself. - Fixed cPatPmtParser::ParsePmt() to reset vpid and vtype when switching from a video to an audio channel (thanks to Reinhard Nissl). +- cDvbDevice now uses the FE_CAN_2G_MODULATION flag to determine whether a device + can handle DVB-S2. The #define is still there to allow people with older drivers + who don't need DVB-S2 to use this version without pathcing. diff --git a/dvbdevice.c b/dvbdevice.c index 8c632c3d..6aa0056f 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.9 2009/01/05 16:08:18 kls Exp $ + * $Id: dvbdevice.c 2.10 2009/01/06 14:52:54 kls Exp $ */ #include "dvbdevice.h" @@ -491,7 +491,7 @@ cDvbDevice::cDvbDevice(int n) if (fd_frontend >= 0) { if (ioctl(fd_frontend, FE_GET_INFO, &frontendInfo) >= 0) { switch (frontendInfo.type) { - case FE_QPSK: frontendType = (frontendInfo.caps & FE_CAN_2ND_GEN_MODULATION) ? SYS_DVBS2 : SYS_DVBS; break; + case FE_QPSK: frontendType = (frontendInfo.caps & FE_CAN_2G_MODULATION) ? SYS_DVBS2 : SYS_DVBS; break; case FE_OFDM: frontendType = SYS_DVBT; break; case FE_QAM: frontendType = SYS_DVBC_ANNEX_AC; break; case FE_ATSC: frontendType = SYS_ATSC; break; -- cgit v1.2.3