frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Adapted the tuning code to the new DVBFE_SET_DELSYS API

This commit is contained in:
Klaus Schmidinger 2008-04-19 09:23:59 +02:00
parent db1da33b7f
commit 17354c3cf5
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1180,6 +1180,7 @@ Reinhard Nissl <rnissl@gmx.de>
early stage of channel switching early stage of channel switching
for fixing displaying transponder data when it is modified for fixing displaying transponder data when it is modified
for fixing handling the counter in detection of pre 1.3.19 PS data 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> Richard Robson <richard_robson@beeb.net>
for reporting freezing replay if a timer starts while in Transfer Mode from the for reporting freezing replay if a timer starts while in Transfer Mode from the

5
HISTORY
View File

@ -5761,3 +5761,8 @@ Video Disk Recorder Revision History
Andreas Mair). Andreas Mair).
- Increased the time between checking the CAM status to 500ms to avoid problems - Increased the time between checking the CAM status to 500ms to avoid problems
with some CAMs (reported by Arthur Konovalov). 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.

6
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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 #ifndef __CONFIG_H
@ -22,8 +22,8 @@
// VDR's own version number: // VDR's own version number:
#define VDRVERSION "1.7.0" #define VDRVERSION "1.7.1"
#define VDRVERSNUM 10700 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10701 // Version * 10000 + Major * 100 + Minor
// The plugin API's version number: // The plugin API's version number:

15
dvbdevice.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "dvbdevice.h"
@ -266,10 +266,6 @@ bool cDvbTuner::SetFrontend(void)
tuneTimeout = DVBS_TUNE_TIMEOUT; tuneTimeout = DVBS_TUNE_TIMEOUT;
lockTimeout = DVBS_LOCK_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) { else if (frontendType & DVBFE_DELSYS_DVBC) {
Frontend.delivery = DVBFE_DELSYS_DVBC; Frontend.delivery = DVBFE_DELSYS_DVBC;
@ -281,10 +277,6 @@ bool cDvbTuner::SetFrontend(void)
tuneTimeout = DVBC_TUNE_TIMEOUT; tuneTimeout = DVBC_TUNE_TIMEOUT;
lockTimeout = DVBC_LOCK_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) { else if (frontendType & DVBFE_DELSYS_DVBT) {
Frontend.delivery = DVBFE_DELSYS_DVBT; Frontend.delivery = DVBFE_DELSYS_DVBT;
@ -302,15 +294,12 @@ bool cDvbTuner::SetFrontend(void)
tuneTimeout = DVBT_TUNE_TIMEOUT; tuneTimeout = DVBT_TUNE_TIMEOUT;
lockTimeout = DVBT_LOCK_TIMEOUT; lockTimeout = DVBT_LOCK_TIMEOUT;
dvbfe_info feinfo;
feinfo.delivery = Frontend.delivery;
CHECK(ioctl(fd_frontend, DVBFE_GET_INFO, &feinfo)); //switch system
} }
else { else {
esyslog("ERROR: attempt to set channel with unknown DVB frontend type"); esyslog("ERROR: attempt to set channel with unknown DVB frontend type");
return false; return false;
} }
CHECK(ioctl(fd_frontend, DVBFE_SET_DELSYS, &Frontend.delivery));
if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) { if (ioctl(fd_frontend, DVBFE_SET_PARAMS, &Frontend) < 0) {
esyslog("ERROR: frontend %d: %m", cardIndex); esyslog("ERROR: frontend %d: %m", cardIndex);
return false; return false;