kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Fix bug uncovered by recent clang.

Browse source 
- Strip Makefile header.
- Bump PORTREVISION.

Submitted by:	pointyhat amd64 10-exprun via miwi
This commit is contained in:
Juergen Lock 2013-05-25 13:39:23 +00:00
parent 02111b30a2
commit f73a685857
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=319050
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
multimedia/vdr-plugin-ttxtsubs/Makefile
View file

@ -1,13 +1,9 @@
# New ports collection makefile for: vdr-plugin-ttxtsubs
# Date created: Fri May 13 18:13:34 CEST 2011
# Whom: Juergen Lock <nox@freebsd.org>
#
# Created by: Juergen Lock <nox@FreeBSD.org>
# $FreeBSD$
#
PORTNAME= vdr-plugin-ttxtsubs
PORTVERSION= 0.2.4
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= multimedia
MASTER_SITES= http://projects.vdr-developer.org/attachments/download/725/
DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}

25
multimedia/vdr-plugin-ttxtsubs/files/patch-vdr-1.7.29 Normal file
View file

@ -0,0 +1,25 @@
--- ttxtsubs.c.orig
+++ ttxtsubs.c
@@ -136,7 +136,7 @@ public:
// -- cStatus
protected:
- virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber);
+ virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView);
virtual void Replaying(const cControl *Control, const char *Name, const char *FileName, bool On);
// virtual void OsdClear(void) { ShowTtxt(); }
// virtual void OsdTitle(const char *Title) { HideTtxt(); }
@@ -333,10 +333,11 @@ bool cPluginTtxtsubs::SetupParse(const c
return true;
}
-void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber)
+void cPluginTtxtsubs::ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView)
{
//dprint("cPluginTtxtsubs::ChannelSwitch(devicenr: %d, channelnr: %d) - mDispl: %x\n", Device->DeviceNumber(), ChannelNumber, mDispl); // XXX
- if (Device->IsPrimaryDevice() && !Device->Replaying() && ChannelNumber)
+ if (LiveView /*Device->IsPrimaryDevice()*/ &&
+ !Device->Replaying() && ChannelNumber)
{
StopTtxt();
DELETENULL(mLiveReceiver);