diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | config.h | 6 | ||||
| -rw-r--r-- | dvbdevice.c | 15 |
4 files changed, 11 insertions, 16 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d02b08d0..6da4a699 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1180,6 +1180,7 @@ Reinhard Nissl <rnissl@gmx.de> early stage of channel switching for fixing displaying transponder data when it is modified for fixing handling the counter in detection of pre 1.3.19 PS data + for adapting the tuning code to the new DVBFE_SET_DELSYS API Richard Robson <richard_robson@beeb.net> for reporting freezing replay if a timer starts while in Transfer Mode from the @@ -5761,3 +5761,8 @@ Video Disk Recorder Revision History Andreas Mair). - Increased the time between checking the CAM status to 500ms to avoid problems with some CAMs (reported by Arthur Konovalov). + +2008-04-19: Version 1.7.1 + +- Adapted the tuning code to the new DVBFE_SET_DELSYS API (thanks to Reinhard Nissl). + VDR now uses the driver from http://jusst.de/hg/multiproto_plus. @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 2.1 2008/04/12 13:02:10 kls Exp $ + * $Id: config.h 2.2 2008/04/19 09:19:22 kls Exp $ */ #ifndef __CONFIG_H @@ -22,8 +22,8 @@ // VDR's own version number: -#define VDRVERSION "1.7.0" -#define VDRVERSNUM 10700 // Version * 10000 + Major * 100 + Minor +#define VDRVERSION "1.7.1" +#define VDRVERSNUM 10701 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff --git a/dvbdevice.c b/dvbdevice.c index 3e603bf0..3e1d6caf 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.2 2008/04/13 13:31:00 kls Exp $ + * $Id: dvbdevice.c 2.3 2008/04/19 09:19:08 kls Exp $ */ #include "dvbdevice.h" @@ -266,10 +266,6 @@ bool cDvbTuner::SetFrontend(void) tuneTimeout = DVBS_TUNE_TIMEOUT; lockTimeout = DVBS_LOCK_TIMEOUT; - - dvbfe_info feinfo; - feinfo.delivery = Frontend.delivery; - CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system } else if (frontendType & DVBFE_DELSYS_DVBC) { Frontend.delivery = DVBFE_DELSYS_DVBC; @@ -281,10 +277,6 @@ bool cDvbTuner::SetFrontend(void) tuneTimeout = DVBC_TUNE_TIMEOUT; lockTimeout = DVBC_LOCK_TIMEOUT; - - dvbfe_info feinfo; - feinfo.delivery = Frontend.delivery; - CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system } else if (frontendType & DVBFE_DELSYS_DVBT) { Frontend.delivery = DVBFE_DELSYS_DVBT; @@ -302,15 +294,12 @@ bool cDvbTuner::SetFrontend(void) tuneTimeout = DVBT_TUNE_TIMEOUT; lockTimeout = DVBT_LOCK_TIMEOUT; - - dvbfe_info feinfo; - feinfo.delivery = Frontend.delivery; - CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system } else { esyslog("ERROR: attempt to set channel with unknown DVB frontend type"); return false; } + CHECK(ioctl(fd_frontend, DVBFE_SET_DELSYS, &Frontend.delivery)); if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) { esyslog("ERROR: frontend %d: %m", cardIndex); return false; |