cDvbDevice now uses the FE_CAN_2G_MODULATION flag

This commit is contained in:
Klaus Schmidinger 2009-01-06 14:52:54 +01:00
parent f9a2758205
commit d1ea5ca06d
2 changed files with 5 additions and 2 deletions

View File

@ -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.

View File

@ -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;