diff options
Diffstat (limited to 'multimedia/vdr/files/patch-dvbdevice.c')
| -rw-r--r-- | multimedia/vdr/files/patch-dvbdevice.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/multimedia/vdr/files/patch-dvbdevice.c b/multimedia/vdr/files/patch-dvbdevice.c index 89760322d0f7..99252462694c 100644 --- a/multimedia/vdr/files/patch-dvbdevice.c +++ b/multimedia/vdr/files/patch-dvbdevice.c @@ -1,14 +1,14 @@ --- dvbdevice.c.orig +++ dvbdevice.c @@ -7,6 +7,7 @@ - * $Id: dvbdevice.c 2.38 2010/05/01 09:47:13 kls Exp $ + * $Id: dvbdevice.c 2.71 2012/05/09 08:33:59 kls Exp $ */ +#include <stdint.h> #include "dvbdevice.h" #include <ctype.h> #include <errno.h> -@@ -592,7 +598,7 @@ int cDvbTuner::GetSignalQuality(void) co +@@ -579,7 +580,7 @@ int cDvbTuner::GetSignalQuality(void) co while (1) { if (ioctl(fd_frontend, FE_READ_SNR, &Snr) != -1) break; @@ -17,7 +17,7 @@ Snr = 0xFFFF; HasSnr = false; break; -@@ -605,7 +611,7 @@ int cDvbTuner::GetSignalQuality(void) co +@@ -592,7 +593,7 @@ int cDvbTuner::GetSignalQuality(void) co while (1) { if (ioctl(fd_frontend, FE_READ_BER, &Ber) != -1) break; @@ -26,7 +26,7 @@ Ber = 0; HasBer = false; break; -@@ -618,7 +624,7 @@ int cDvbTuner::GetSignalQuality(void) co +@@ -605,7 +606,7 @@ int cDvbTuner::GetSignalQuality(void) co while (1) { if (ioctl(fd_frontend, FE_READ_UNCORRECTED_BLOCKS, &Unc) != -1) break; @@ -35,3 +35,21 @@ Unc = 0; HasUnc = false; break; +@@ -732,7 +733,7 @@ bool cDvbTuner::SetFrontend(void) + if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) { + frequency -= diseqc->Lof(); + if (diseqc != lastDiseqc || diseqc->IsScr()) { +- if (GetBondedMaster() == this) { ++ if (!bondedTuner || bondedMaster) { + ExecuteDiseqc(diseqc, &frequency); + if (frequency == 0) + return false; +@@ -758,7 +759,7 @@ bool cDvbTuner::SetFrontend(void) + tone = SEC_TONE_ON; + } + int volt = (dtp.Polarization() == 'V' || dtp.Polarization() == 'R') ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18; +- if (GetBondedMaster() != this) { ++ if (bondedTuner && !bondedMaster) { + tone = SEC_TONE_OFF; + volt = SEC_VOLTAGE_13; + } |