svn commit: r312664 - in head/multimedia/vdr: . files

[Juergen Lock]

Author: nox
Date: Wed Feb 20 20:20:23 2013
New Revision: 312664
URL: http://svnweb.freebsd.org/changeset/ports/312664

Log:
  Add two fixes for device bonding. (locking and OSD LNB setup menu)
  
  Obtained from:	upstream author via vdr mailinglist

Added:
  head/multimedia/vdr/files/patch-menu.c   (contents, props changed)
Modified:
  head/multimedia/vdr/Makefile
  head/multimedia/vdr/files/patch-dvbdevice.c   (contents, props changed)

Modified: head/multimedia/vdr/Makefile
==============================================================================
--- head/multimedia/vdr/Makefile	Wed Feb 20 20:17:46 2013	(r312663)
+++ head/multimedia/vdr/Makefile	Wed Feb 20 20:20:23 2013	(r312664)
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr
 PORTVERSION=	1.7.29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.tvdr.de/vdr/Developer/
 

Modified: head/multimedia/vdr/files/patch-dvbdevice.c
==============================================================================
--- head/multimedia/vdr/files/patch-dvbdevice.c	Wed Feb 20 20:17:46 2013	(r312663)
+++ head/multimedia/vdr/files/patch-dvbdevice.c	Wed Feb 20 20:20:23 2013	(r312664)
@@ -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;
+            }

Added: head/multimedia/vdr/files/patch-menu.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vdr/files/patch-menu.c	Wed Feb 20 20:20:23 2013	(r312664)
@@ -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;
+          }
+      }
+