diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2013-02-20 20:20:23 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2013-02-20 20:20:23 +0000 |
| commit | 912175354a0dc587368786d95c1a71756c32d098 (patch) | |
| tree | b8aa10bf807ccf48b892f7f7e30e2506ac1e81f5 /multimedia/vdr | |
| parent | 3ff14d3511b2de7084579f76cf4332555c5fbe1e (diff) | |
| download | ports-912175354a0dc587368786d95c1a71756c32d098.tar.gz ports-912175354a0dc587368786d95c1a71756c32d098.zip | |
Add two fixes for device bonding. (locking and OSD LNB setup menu)
Obtained from: upstream author via vdr mailinglist
Notes
Notes:
svn path=/head/; revision=312664
Diffstat (limited to 'multimedia/vdr')
| -rw-r--r-- | multimedia/vdr/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/vdr/files/patch-dvbdevice.c | 26 | ||||
| -rw-r--r-- | multimedia/vdr/files/patch-menu.c | 11 |
3 files changed, 34 insertions, 5 deletions
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile index e5525bff64f6..a33986730e30 100644 --- a/multimedia/vdr/Makefile +++ b/multimedia/vdr/Makefile @@ -7,7 +7,7 @@ PORTNAME= vdr PORTVERSION= 1.7.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.tvdr.de/vdr/Developer/ 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; + } diff --git a/multimedia/vdr/files/patch-menu.c b/multimedia/vdr/files/patch-menu.c new file mode 100644 index 000000000000..69ddfd64d14f --- /dev/null +++ b/multimedia/vdr/files/patch-menu.c @@ -0,0 +1,11 @@ +--- menu.c.orig ++++ menu.c +@@ -2938,6 +2938,8 @@ void cMenuSetupLNB::Setup(void) + for (int i = 0; i < cDevice::NumDevices(); i++) { + if (cDevice::GetDevice(i)->ProvidesSource(cSource::stSat)) + Add(new cMenuEditIntItem(cString::sprintf(tr("Setup.LNB$Device %d connected to sat cable"), i + 1), &satCableNumbers.Array()[i], 0, NumSatDevices, tr("Setup.LNB$own"))); ++ else ++ satCableNumbers.Array()[i] = 0; + } + } + |