svn commit: r312357 - in head/multimedia/vdr-plugin-infosatepg: . files

[Juergen Lock]

Author: nox
Date: Sat Feb 16 15:04:16 2013
New Revision: 312357
URL: http://svnweb.freebsd.org/changeset/ports/312357

Log:
  - Add bugfix for infosatepg grabbing a bonded device.
  - Convert Makefile header.

Modified:
  head/multimedia/vdr-plugin-infosatepg/Makefile
  head/multimedia/vdr-plugin-infosatepg/files/patch-infosatepg.cpp   (contents, props changed)

Modified: head/multimedia/vdr-plugin-infosatepg/Makefile
==============================================================================
--- head/multimedia/vdr-plugin-infosatepg/Makefile	Sat Feb 16 14:58:51 2013	(r312356)
+++ head/multimedia/vdr-plugin-infosatepg/Makefile	Sat Feb 16 15:04:16 2013	(r312357)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	vdr-plugin-infosatepg
-# Date created:		Wed Apr 14 18:11:42 CEST 2010
-# Whom:			Juergen Lock <nox at freebsd.org>
-#
+# Created by: Juergen Lock <nox at freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	vdr-plugin-infosatepg
 PORTVERSION=	0.0.11
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	multimedia
 MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/342/
 DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}

Modified: head/multimedia/vdr-plugin-infosatepg/files/patch-infosatepg.cpp
==============================================================================
--- head/multimedia/vdr-plugin-infosatepg/files/patch-infosatepg.cpp	Sat Feb 16 14:58:51 2013	(r312356)
+++ head/multimedia/vdr-plugin-infosatepg/files/patch-infosatepg.cpp	Sat Feb 16 15:04:16 2013	(r312357)
@@ -16,7 +16,16 @@
              if (dev->IsTunedToTransponder(chan))
              {
                  // we already have a device which is tuned (maybe switched manually?)
-@@ -403,7 +407,7 @@ cString cPluginInfosatepg::SVDRPCommand(
+@@ -202,6 +206,8 @@ void cPluginInfosatepg::MainThreadHook(v
+                 return;
+             }
+ 
++            if (!dev->MaySwitchTransponder(chan)) continue; // bonded?
++
+             // ok -> use this device
+             dsyslog("infosatepg: found free device %i",dev->DeviceNumber()+1);
+             dev->SwitchChannel(chan,false);
+@@ -403,7 +409,7 @@ cString cPluginInfosatepg::SVDRPCommand(
          cString head2;
          head2="\n" \
                "      |        | missed  |            |            | unlocated\n" \