1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Disabled 'preliminary fix for UPT error'

This commit is contained in:
Klaus Schmidinger 2004-02-24 10:15:46 +01:00
parent d9401eb27b
commit e3171acd59
2 changed files with 9 additions and 2 deletions

View File

@ -2667,6 +2667,11 @@ Video Disk Recorder Revision History
now initiates an "emergency exit" if the number of UPT errors during one now initiates an "emergency exit" if the number of UPT errors during one
recording exceeds 10 (suggested by Gregoire Favre). Since the UPT error doesn't recording exceeds 10 (suggested by Gregoire Favre). Since the UPT error doesn't
happen on my system, this has not been explicitly tested. happen on my system, this has not been explicitly tested.
The "preliminary fix" for the UPT error in VDR/dvbdevice.c has been disabled
by default, since it makes channel switching unpleasently slow. If you want
to have that workaround back, you can uncomment the line
//#define WAIT_FOR_LOCK_AFTER_TUNING 1
in VDR/dvbdevice.c.
- Adapted the 'sky' plugin to use the actual channel IDs, and to fetch EPG data - Adapted the 'sky' plugin to use the actual channel IDs, and to fetch EPG data
from www.bleb.org. from www.bleb.org.
- Limited automatic retuning to devices that actually provide the transponder - Limited automatic retuning to devices that actually provide the transponder

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 1.81 2004/02/08 14:07:07 kls Exp $ * $Id: dvbdevice.c 1.82 2004/02/24 10:12:13 kls Exp $
*/ */
#include "dvbdevice.h" #include "dvbdevice.h"
@ -35,6 +35,7 @@ extern "C" {
#define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1 #define DO_REC_AND_PLAY_ON_PRIMARY_DEVICE 1
#define DO_MULTIPLE_RECORDINGS 1 #define DO_MULTIPLE_RECORDINGS 1
//#define WAIT_FOR_LOCK_AFTER_TUNING 1
#define DEV_VIDEO "/dev/video" #define DEV_VIDEO "/dev/video"
#define DEV_DVB_ADAPTER "/dev/dvb/adapter" #define DEV_DVB_ADAPTER "/dev/dvb/adapter"
@ -751,11 +752,12 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView)
dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution//XXX dvbTuner->Set(Channel, DoTune, !EITScanner.UsesDevice(this)); //XXX 1.3: this is an ugly hack - find a cleaner solution//XXX
#ifdef WAIT_FOR_LOCK_AFTER_TUNING
//XXX TODO preliminary fix for the "Unknown picture type" error //XXX TODO preliminary fix for the "Unknown picture type" error
time_t t0 = time(NULL); time_t t0 = time(NULL);
while (!dvbTuner->Locked() && time(NULL) - t0 < 5) while (!dvbTuner->Locked() && time(NULL) - t0 < 5)
usleep(100); usleep(100);
//XXX #endif
// PID settings: // PID settings:
if (TurnOnLivePIDs) { if (TurnOnLivePIDs) {