[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.18-2_ctvdr1-7-g1f0067a
etobi
git at e-tobi.net
Sun Jun 19 18:25:32 UTC 2011
The following commit has been merged in the e-tobi branch:
commit 1f0067a00a811935da05bec0caf0b19ac942d09f
Author: etobi <git at e-tobi.net>
Date: Sun Jun 19 20:22:37 2011 +0200
* Updated opt-21_internal-cam-devices.dpatch
* Updated opt-27_ttxtsubs.dpatch
* Updated opt-39_noepg.dpatch
* Updated opt-44_rotor.dpatch
diff --git a/debian/changelog b/debian/changelog
index 65a9d2b..3973c3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ vdr (1.7.19-1~ctvdr1) unstable; urgency=low
* New upstream release
* Dropped 99_gcc4.6-fix.dpatch (fixed upstream)
+ * Updated opt-21_internal-cam-devices.dpatch
+ * Updated opt-27_ttxtsubs.dpatch
+ * Updated opt-39_noepg.dpatch
+ * Updated opt-44_rotor.dpatch
-- Tobias Grimm <etobi at debian.org> Sun, 19 Jun 2011 18:55:51 +0200
diff --git a/debian/patches/opt-21_internal-cam-devices.dpatch b/debian/patches/opt-21_internal-cam-devices.dpatch
index 681c25b..ed35e30 100644
--- a/debian/patches/opt-21_internal-cam-devices.dpatch
+++ b/debian/patches/opt-21_internal-cam-devices.dpatch
@@ -8,10 +8,10 @@
## DP: See also: http://www.vdr-developer.org/mantisbt/view.php?id=429
@DPATCH@
-diff -urNad vdr-1.6.0~/device.c vdr-1.6.0/device.c
---- vdr-1.6.0~/device.c 2008-03-09 11:03:34.000000000 +0100
-+++ vdr-1.6.0/device.c 2008-07-24 16:34:52.000000000 +0200
-@@ -363,6 +363,7 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/device.c vdr-1.7.19/device.c
+--- vdr-1.7.19~/device.c 2011-06-19 19:44:13.000000000 +0200
++++ vdr-1.7.19/device.c 2011-06-19 19:53:00.000000000 +0200
+@@ -236,6 +236,7 @@
int NumCamSlots = CamSlots.Count();
int SlotPriority[NumCamSlots];
int NumUsableSlots = 0;
@@ -19,7 +19,7 @@ diff -urNad vdr-1.6.0~/device.c vdr-1.6.0/device.c
if (Channel->Ca() >= CA_ENCRYPTED_MIN) {
for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) {
SlotPriority[CamSlot->Index()] = MAXPRIORITY + 1; // assumes it can't be used
-@@ -376,7 +377,7 @@
+@@ -249,7 +250,7 @@
}
}
if (!NumUsableSlots)
@@ -28,7 +28,7 @@ diff -urNad vdr-1.6.0~/device.c vdr-1.6.0/device.c
}
bool NeedsDetachReceivers = false;
-@@ -392,11 +393,13 @@
+@@ -265,11 +266,13 @@
continue; // this device shall be temporarily avoided
if (Channel->Ca() && Channel->Ca() <= CA_DVB_MAX && Channel->Ca() != device[i]->CardIndex() + 1)
continue; // a specific card was requested, but not this one
@@ -44,19 +44,20 @@ diff -urNad vdr-1.6.0~/device.c vdr-1.6.0/device.c
ndr = true; // using a different CAM slot requires detaching receivers
// Put together an integer number that reflects the "impact" using
// this device would have on the overall system. Each condition is represented
-@@ -410,18 +413,18 @@
+@@ -283,19 +286,19 @@
imp <<= 1; imp |= device[i]->Receiving(); // avoid devices that are receiving
+ imp <<= 4; imp |= GetClippedNumProvidedSystems(4, device[i]) - 1; // avoid cards which support multiple delivery systems
imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice(); // avoid the Transfer Mode receiver device
- imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF); // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
-- imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF); // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
+- imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF); // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
+ imp <<= 8; imp |= min(max((NumUsableSlots ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF); // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
+ imp <<= 8; imp |= min(max(((NumUsableSlots && !device[i]->HasInternalCam()) ? SlotPriority[j] : 0) + MAXPRIORITY, 0), 0xFF); // use the CAM slot with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)
imp <<= 1; imp |= ndr; // avoid devices if we need to detach existing receivers
- imp <<= 1; imp |= device[i]->IsPrimaryDevice(); // avoid the primary device
- imp <<= 1; imp |= NumUsableSlots ? 0 : device[i]->HasCi(); // avoid cards with Common Interface for FTA channels
+ imp <<= 1; imp |= (NumUsableSlots || InternalCamNeeded) ? 0 : device[i]->HasCi(); // avoid cards with Common Interface for FTA channels
- imp <<= 1; imp |= device[i]->HasDecoder(); // avoid full featured cards
+ imp <<= 1; imp |= device[i]->AvoidRecording(); // avoid SD full featured cards
- imp <<= 1; imp |= NumUsableSlots ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
+ imp <<= 1; imp |= (NumUsableSlots && !device[i]->HasInternalCam()) ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), j + 1) : 0; // prefer CAMs that are known to decrypt this channel
+ imp <<= 1; imp |= device[i]->IsPrimaryDevice(); // avoid the primary device
if (imp < Impact) {
// This device has less impact than any previous one, so we take it.
Impact = imp;
@@ -67,10 +68,10 @@ diff -urNad vdr-1.6.0~/device.c vdr-1.6.0/device.c
s = CamSlots.Get(j);
}
}
-diff -urNad vdr-1.6.0~/device.h vdr-1.6.0/device.h
---- vdr-1.6.0~/device.h 2008-02-23 14:13:04.000000000 +0100
-+++ vdr-1.6.0/device.h 2008-07-24 16:36:12.000000000 +0200
-@@ -335,6 +335,13 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/device.h vdr-1.7.19/device.h
+--- vdr-1.7.19~/device.h 2011-06-02 15:15:31.000000000 +0200
++++ vdr-1.7.19/device.h 2011-06-19 19:44:13.000000000 +0200
+@@ -376,6 +376,13 @@
public:
virtual bool HasCi(void);
///< Returns true if this device has a Common Interface.
diff --git a/debian/patches/opt-27_ttxtsubs.dpatch b/debian/patches/opt-27_ttxtsubs.dpatch
index 3b92e8c..b3f4b55 100644
--- a/debian/patches/opt-27_ttxtsubs.dpatch
+++ b/debian/patches/opt-27_ttxtsubs.dpatch
@@ -8,11 +8,10 @@
## DP: This patch is needed for the ttxtsubs plugin.
@DPATCH@
-diff --git a/MANUAL b/MANUAL
-index 7fae53b..6b0ae57 100644
---- a/MANUAL
-+++ b/MANUAL
-@@ -730,6 +730,9 @@ Version 1.6
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/MANUAL vdr-1.7.19/MANUAL
+--- vdr-1.7.19~/MANUAL 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/MANUAL 2011-06-19 20:00:31.000000000 +0200
+@@ -730,6 +730,9 @@
background transparency. By default the values as broadcast
are used.
@@ -22,11 +21,10 @@ index 7fae53b..6b0ae57 100644
LNB:
SLOF = 11700 The switching frequency (in MHz) between low and
-diff --git a/Makefile b/Makefile
-index d788484..f854b2e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -44,6 +44,8 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/Makefile vdr-1.7.19/Makefile
+--- vdr-1.7.19~/Makefile 2011-05-21 14:21:40.000000000 +0200
++++ vdr-1.7.19/Makefile 2011-06-19 20:00:31.000000000 +0200
+@@ -45,6 +45,8 @@
skinclassic.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\
timers.o tools.o transfer.o vdr.o videodir.o
@@ -35,11 +33,10 @@ index d788484..f854b2e 100644
ifndef NO_KBD
DEFINES += -DREMOTE_KBD
endif
-diff --git a/channels.c b/channels.c
-index ebc7eb1..8e7e1a1 100644
---- a/channels.c
-+++ b/channels.c
-@@ -376,6 +376,26 @@ void cChannel::SetSubtitlingDescriptors(uchar *SubtitlingTypes, uint16_t *Compos
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/channels.c vdr-1.7.19/channels.c
+--- vdr-1.7.19~/channels.c 2010-11-07 13:24:59.000000000 +0100
++++ vdr-1.7.19/channels.c 2011-06-19 20:00:31.000000000 +0200
+@@ -378,6 +378,26 @@
}
}
@@ -66,7 +63,7 @@ index ebc7eb1..8e7e1a1 100644
void cChannel::SetCaIds(const int *CaIds)
{
if (caids[0] && caids[0] <= CA_USER_MAX)
-@@ -504,11 +524,22 @@ cString cChannel::ToText(const cChannel *Channel)
+@@ -506,11 +526,22 @@
q += IntArrayToString(q, Channel->dpids, 10, Channel->dlangs, Channel->dtypes);
}
*q = 0;
@@ -90,7 +87,7 @@ index ebc7eb1..8e7e1a1 100644
}
return buffer;
}
-@@ -542,8 +573,9 @@ bool cChannel::Parse(const char *s)
+@@ -544,8 +575,9 @@
char *parambuf = NULL;
char *vpidbuf = NULL;
char *apidbuf = NULL;
@@ -101,7 +98,7 @@ index ebc7eb1..8e7e1a1 100644
if (fields >= 9) {
if (fields == 9) {
// allow reading of old format
-@@ -642,7 +674,37 @@ bool cChannel::Parse(const char *s)
+@@ -644,7 +676,37 @@
dpids[NumDpids] = 0;
dtypes[NumDpids] = 0;
}
@@ -140,7 +137,7 @@ index ebc7eb1..8e7e1a1 100644
if (caidbuf) {
char *p = caidbuf;
char *q;
-@@ -679,6 +741,7 @@ bool cChannel::Parse(const char *s)
+@@ -681,6 +743,7 @@
free(sourcebuf);
free(vpidbuf);
free(apidbuf);
@@ -148,10 +145,9 @@ index ebc7eb1..8e7e1a1 100644
free(caidbuf);
free(namebuf);
if (!GetChannelID().Valid()) {
-diff --git a/channels.h b/channels.h
-index b867297..63c8b9c 100644
---- a/channels.h
-+++ b/channels.h
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/channels.h vdr-1.7.19/channels.h
+--- vdr-1.7.19~/channels.h 2010-06-05 15:12:54.000000000 +0200
++++ vdr-1.7.19/channels.h 2011-06-19 20:00:31.000000000 +0200
@@ -35,6 +35,7 @@
#define MAXDPIDS 16 // dolby (AC3 + DTS)
#define MAXSPIDS 32 // subtitles
@@ -160,7 +156,7 @@ index b867297..63c8b9c 100644
#define MAXLANGCODE1 4 // a 3 letter language code, zero terminated
#define MAXLANGCODE2 8 // up to two 3 letter language codes, separated by '+' and zero terminated
-@@ -71,6 +72,16 @@ public:
+@@ -71,6 +72,16 @@
static const tChannelID InvalidID;
};
@@ -177,7 +173,7 @@ index b867297..63c8b9c 100644
class cChannel;
class cLinkChannel : public cListObject {
-@@ -115,6 +126,9 @@ private:
+@@ -115,6 +126,9 @@
uint16_t compositionPageIds[MAXSPIDS];
uint16_t ancillaryPageIds[MAXSPIDS];
int tpid;
@@ -187,7 +183,7 @@ index b867297..63c8b9c 100644
int caids[MAXCAIDS + 1]; // list is zero-terminated
int nid;
int tid;
-@@ -164,6 +178,8 @@ public:
+@@ -164,6 +178,8 @@
uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : uint16_t(0); }
uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : uint16_t(0); }
int Tpid(void) const { return tpid; }
@@ -196,7 +192,7 @@ index b867297..63c8b9c 100644
const int *Caids(void) const { return caids; }
int Ca(int Index = 0) const { return Index < MAXCAIDS ? caids[Index] : 0; }
int Nid(void) const { return nid; }
-@@ -190,6 +206,7 @@ public:
+@@ -190,6 +206,7 @@
void SetName(const char *Name, const char *ShortName, const char *Provider);
void SetPortalName(const char *PortalName);
void SetPids(int Vpid, int Ppid, int Vtype, int *Apids, int *Atypes, char ALangs[][MAXLANGCODE2], int *Dpids, int *Dtypes, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid);
@@ -204,34 +200,32 @@ index b867297..63c8b9c 100644
void SetCaIds(const int *CaIds); // list must be zero-terminated
void SetCaDescriptors(int Level);
void SetLinkChannels(cLinkChannels *LinkChannels);
-diff --git a/ci.c b/ci.c
-index 6c7b031..22fda9f 100644
---- a/ci.c
-+++ b/ci.c
-@@ -1911,6 +1911,8 @@ void cCamSlot::AddChannel(const cChannel *Channel)
- AddPid(Channel->Sid(), *Apid, STREAM_TYPE_AUDIO);
- for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
- AddPid(Channel->Sid(), *Dpid, STREAM_TYPE_DOLBY);
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/ci.c vdr-1.7.19/ci.c
+--- vdr-1.7.19~/ci.c 2011-05-21 17:21:33.000000000 +0200
++++ vdr-1.7.19/ci.c 2011-06-19 20:03:39.000000000 +0200
+@@ -1914,6 +1914,8 @@
+ for (const int *Spid = Channel->Spids(); *Spid; Spid++)
+ AddPid(Channel->Sid(), *Spid, STREAM_TYPE_PRIVATE);
+ }
+ if (Channel->Tpid() && Setup.SupportTeletext)
+ AddPid(Channel->Sid(), Channel->Tpid(), STREAM_TYPE_DOLBY);
- }
}
-@@ -1932,6 +1934,9 @@ bool cCamSlot::CanDecrypt(const cChannel *Channel)
- CaPmt.AddPid(*Apid, STREAM_TYPE_AUDIO);
- for (const int *Dpid = Channel->Dpids(); *Dpid; Dpid++)
- CaPmt.AddPid(*Dpid, STREAM_TYPE_DOLBY);
+ #define QUERY_REPLY_WAIT 100 // ms to wait between checks for a reply
+@@ -1936,6 +1938,9 @@
+ CaPmt.AddPid(*Dpid, STREAM_TYPE_PRIVATE);
+ for (const int *Spid = Channel->Spids(); *Spid; Spid++)
+ CaPmt.AddPid(*Spid, STREAM_TYPE_PRIVATE);
+ if (Channel->Tpid() && Setup.SupportTeletext) {
+ CaPmt.AddPid(Channel->Tpid(), STREAM_TYPE_DOLBY); // FIXME: STREAM_TYPE_DOLBY should probably be renamed STREAM_TYPE_PRIVATE
+ }
cas->SendPMT(&CaPmt);
cTimeMs Timeout(QUERY_REPLY_TIMEOUT);
do {
-diff --git a/config.c b/config.c
-index 73b11b1..f2eebe6 100644
---- a/config.c
-+++ b/config.c
-@@ -333,6 +333,7 @@ cSetup::cSetup(void)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/config.c vdr-1.7.19/config.c
+--- vdr-1.7.19~/config.c 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/config.c 2011-06-19 20:00:31.000000000 +0200
+@@ -333,6 +333,7 @@
MarginStop = 10;
AudioLanguages[0] = -1;
DisplaySubtitles = 0;
@@ -239,7 +233,7 @@ index 73b11b1..f2eebe6 100644
SubtitleLanguages[0] = -1;
SubtitleOffset = 0;
SubtitleFgTransparency = 0;
-@@ -524,6 +525,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
+@@ -533,6 +534,7 @@
else if (!strcasecmp(Name, "MarginStop")) MarginStop = atoi(Value);
else if (!strcasecmp(Name, "AudioLanguages")) return ParseLanguages(Value, AudioLanguages);
else if (!strcasecmp(Name, "DisplaySubtitles")) DisplaySubtitles = atoi(Value);
@@ -247,7 +241,7 @@ index 73b11b1..f2eebe6 100644
else if (!strcasecmp(Name, "SubtitleLanguages")) return ParseLanguages(Value, SubtitleLanguages);
else if (!strcasecmp(Name, "SubtitleOffset")) SubtitleOffset = atoi(Value);
else if (!strcasecmp(Name, "SubtitleFgTransparency")) SubtitleFgTransparency = atoi(Value);
-@@ -620,6 +622,7 @@ bool cSetup::Save(void)
+@@ -637,6 +639,7 @@
Store("MarginStop", MarginStop);
StoreLanguages("AudioLanguages", AudioLanguages);
Store("DisplaySubtitles", DisplaySubtitles);
@@ -255,11 +249,10 @@ index 73b11b1..f2eebe6 100644
StoreLanguages("SubtitleLanguages", SubtitleLanguages);
Store("SubtitleOffset", SubtitleOffset);
Store("SubtitleFgTransparency", SubtitleFgTransparency);
-diff --git a/config.h b/config.h
-index 7041eb7..289d4b6 100644
---- a/config.h
-+++ b/config.h
-@@ -235,6 +235,7 @@ public:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/config.h vdr-1.7.19/config.h
+--- vdr-1.7.19~/config.h 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/config.h 2011-06-19 20:00:31.000000000 +0200
+@@ -239,6 +239,7 @@
int MarginStart, MarginStop;
int AudioLanguages[I18N_MAX_LANGUAGES + 1];
int DisplaySubtitles;
@@ -267,10 +260,9 @@ index 7041eb7..289d4b6 100644
int SubtitleLanguages[I18N_MAX_LANGUAGES + 1];
int SubtitleOffset;
int SubtitleFgTransparency, SubtitleBgTransparency;
-diff --git a/device.c b/device.c
-index 681049b..4dbd920 100644
---- a/device.c
-+++ b/device.c
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/device.c vdr-1.7.19/device.c
+--- vdr-1.7.19~/device.c 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/device.c 2011-06-19 20:00:31.000000000 +0200
@@ -18,6 +18,7 @@
#include "receiver.h"
#include "status.h"
@@ -279,7 +271,7 @@ index 681049b..4dbd920 100644
// --- cLiveSubtitle ---------------------------------------------------------
-@@ -1223,6 +1224,13 @@ int cDevice::PlayPesPacket(const uchar *Data, int Length, bool VideoOnly)
+@@ -1249,6 +1250,13 @@
}
break;
case 0xBD: { // private stream 1
@@ -293,7 +285,7 @@ index 681049b..4dbd920 100644
int PayloadOffset = Data[8] + 9;
// Compatibility mode for old subtitles plugin:
-@@ -1382,6 +1390,7 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
+@@ -1408,6 +1416,7 @@
tsToPesVideo.Reset();
tsToPesAudio.Reset();
tsToPesSubtitle.Reset();
@@ -301,7 +293,7 @@ index 681049b..4dbd920 100644
}
else if (Length < TS_SIZE) {
esyslog("ERROR: skipped %d bytes of TS fragment", Length);
-@@ -1427,6 +1436,17 @@ int cDevice::PlayTs(const uchar *Data, int Length, bool VideoOnly)
+@@ -1453,6 +1462,17 @@
if (!VideoOnly || HasIBPTrickSpeed())
PlayTsSubtitle(Data, TS_SIZE);
}
@@ -319,11 +311,10 @@ index 681049b..4dbd920 100644
}
}
else if (Pid == patPmtParser.Ppid()) {
-diff --git a/device.h b/device.h
-index cb3bc2c..f531e70 100644
---- a/device.h
-+++ b/device.h
-@@ -522,6 +522,7 @@ private:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/device.h vdr-1.7.19/device.h
+--- vdr-1.7.19~/device.h 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/device.h 2011-06-19 20:00:31.000000000 +0200
+@@ -541,6 +541,7 @@
cTsToPes tsToPesVideo;
cTsToPes tsToPesAudio;
cTsToPes tsToPesSubtitle;
@@ -331,11 +322,10 @@ index cb3bc2c..f531e70 100644
bool isPlayingVideo;
protected:
const cPatPmtParser *PatPmtParser(void) const { return &patPmtParser; }
-diff --git a/menu.c b/menu.c
-index 19cfabb..d2deeb3 100644
---- a/menu.c
-+++ b/menu.c
-@@ -2790,6 +2790,7 @@ void cMenuSetupDVB::Setup(void)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/menu.c vdr-1.7.19/menu.c
+--- vdr-1.7.19~/menu.c 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/menu.c 2011-06-19 20:00:31.000000000 +0200
+@@ -2999,6 +2999,7 @@
Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle foreground transparency"), &data.SubtitleFgTransparency, 0, 9));
Add(new cMenuEditIntItem( tr("Setup.DVB$Subtitle background transparency"), &data.SubtitleBgTransparency, 0, 10));
}
@@ -343,10 +333,9 @@ index 19cfabb..d2deeb3 100644
SetCurrent(Get(current));
Display();
-diff --git a/pat.c b/pat.c
-index 56ad5ae..e313e23 100644
---- a/pat.c
-+++ b/pat.c
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/pat.c vdr-1.7.19/pat.c
+--- vdr-1.7.19~/pat.c 2011-04-17 15:45:25.000000000 +0200
++++ vdr-1.7.19/pat.c 2011-06-19 20:00:31.000000000 +0200
@@ -13,6 +13,7 @@
#include "libsi/section.h"
#include "libsi/descriptor.h"
@@ -355,7 +344,7 @@ index 56ad5ae..e313e23 100644
#define PMT_SCAN_TIMEOUT 10 // seconds
-@@ -343,6 +344,8 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -343,6 +344,8 @@
char DLangs[MAXDPIDS][MAXLANGCODE2] = { "" };
char SLangs[MAXSPIDS][MAXLANGCODE2] = { "" };
int Tpid = 0;
@@ -364,7 +353,7 @@ index 56ad5ae..e313e23 100644
int NumApids = 0;
int NumDpids = 0;
int NumSpids = 0;
-@@ -434,8 +437,21 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -434,8 +437,21 @@
NumSpids++;
}
break;
@@ -387,7 +376,7 @@ index 56ad5ae..e313e23 100644
break;
case SI::ISO639LanguageDescriptorTag: {
SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
-@@ -490,6 +506,12 @@ void cPatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
+@@ -537,6 +553,12 @@
}
if (Setup.UpdateChannels >= 2) {
Channel->SetPids(Vpid, Ppid, Vtype, Apids, Atypes, ALangs, Dpids, Dtypes, DLangs, Spids, SLangs, Tpid);
@@ -400,11 +389,10 @@ index 56ad5ae..e313e23 100644
Channel->SetCaIds(CaDescriptors->CaIds());
Channel->SetSubtitlingDescriptors(SubtitlingTypes, CompositionPageIds, AncillaryPageIds);
}
-diff --git a/po/ca_ES.po b/po/ca_ES.po
-index 247113b..aba1ae3 100644
---- a/po/ca_ES.po
-+++ b/po/ca_ES.po
-@@ -943,6 +943,9 @@ msgstr "Transpar
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/ca_ES.po vdr-1.7.19/po/ca_ES.po
+--- vdr-1.7.19~/po/ca_ES.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/ca_ES.po 2011-06-19 20:00:31.000000000 +0200
+@@ -944,6 +944,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparència fons subtítols"
@@ -414,11 +402,10 @@ index 247113b..aba1ae3 100644
msgid "LNB"
msgstr "Configuració de l'LNB"
-diff --git a/po/cs_CZ.po b/po/cs_CZ.po
-index f6313ba..aec6f4e 100644
---- a/po/cs_CZ.po
-+++ b/po/cs_CZ.po
-@@ -942,6 +942,9 @@ msgstr "Průhlednost pÃsma titulků"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/cs_CZ.po vdr-1.7.19/po/cs_CZ.po
+--- vdr-1.7.19~/po/cs_CZ.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/cs_CZ.po 2011-06-19 20:00:31.000000000 +0200
+@@ -943,6 +943,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Průhlednost pozadà titulků"
@@ -428,11 +415,10 @@ index f6313ba..aec6f4e 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/da_DK.po b/po/da_DK.po
-index 40cdebd..192173d 100644
---- a/po/da_DK.po
-+++ b/po/da_DK.po
-@@ -940,6 +940,9 @@ msgstr "Undertekst forgrundsgennemsigtighed"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/da_DK.po vdr-1.7.19/po/da_DK.po
+--- vdr-1.7.19~/po/da_DK.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/da_DK.po 2011-06-19 20:00:31.000000000 +0200
+@@ -941,6 +941,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Undertekst baggrundsgennemsigtighed"
@@ -442,11 +428,10 @@ index 40cdebd..192173d 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/de_DE.po b/po/de_DE.po
-index 4d4f3df..a3227a0 100644
---- a/po/de_DE.po
-+++ b/po/de_DE.po
-@@ -940,6 +940,9 @@ msgstr "Untertitel-Transparenz Vordergrund"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/de_DE.po vdr-1.7.19/po/de_DE.po
+--- vdr-1.7.19~/po/de_DE.po 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/po/de_DE.po 2011-06-19 20:00:31.000000000 +0200
+@@ -941,6 +941,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Untertitel-Transparenz Hintergrund"
@@ -456,11 +441,10 @@ index 4d4f3df..a3227a0 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/el_GR.po b/po/el_GR.po
-index 5414ebc..913f39e 100644
---- a/po/el_GR.po
-+++ b/po/el_GR.po
-@@ -940,6 +940,9 @@ msgstr ""
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/el_GR.po vdr-1.7.19/po/el_GR.po
+--- vdr-1.7.19~/po/el_GR.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/el_GR.po 2011-06-19 20:00:31.000000000 +0200
+@@ -941,6 +941,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr ""
@@ -470,11 +454,10 @@ index 5414ebc..913f39e 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/es_ES.po b/po/es_ES.po
-index 217f775..78a9491 100644
---- a/po/es_ES.po
-+++ b/po/es_ES.po
-@@ -941,6 +941,9 @@ msgstr "Transparencia primer plano subt
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/es_ES.po vdr-1.7.19/po/es_ES.po
+--- vdr-1.7.19~/po/es_ES.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/es_ES.po 2011-06-19 20:00:31.000000000 +0200
+@@ -942,6 +942,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparencia fondo subtítulos"
@@ -484,11 +467,10 @@ index 217f775..78a9491 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/et_EE.po b/po/et_EE.po
-index 5010dc4..af2e2d3 100644
---- a/po/et_EE.po
-+++ b/po/et_EE.po
-@@ -940,6 +940,9 @@ msgstr "Subtiitri l
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/et_EE.po vdr-1.7.19/po/et_EE.po
+--- vdr-1.7.19~/po/et_EE.po 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/po/et_EE.po 2011-06-19 20:00:31.000000000 +0200
+@@ -941,6 +941,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Subtiitri tausta läbipaistvus"
@@ -498,11 +480,10 @@ index 5010dc4..af2e2d3 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/fi_FI.po b/po/fi_FI.po
-index cd57e7c..e6a22bf 100644
---- a/po/fi_FI.po
-+++ b/po/fi_FI.po
-@@ -943,6 +943,9 @@ msgstr "Tekstityksen läpinäkyvyys"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/fi_FI.po vdr-1.7.19/po/fi_FI.po
+--- vdr-1.7.19~/po/fi_FI.po 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/po/fi_FI.po 2011-06-19 20:00:31.000000000 +0200
+@@ -944,6 +944,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Tekstityksen taustan läpinäkyvyys"
@@ -512,11 +493,10 @@ index cd57e7c..e6a22bf 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/fr_FR.po b/po/fr_FR.po
-index 0d4cb7c..770038e 100644
---- a/po/fr_FR.po
-+++ b/po/fr_FR.po
-@@ -946,6 +946,9 @@ msgstr "Transparence de l'avant-plan"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/fr_FR.po vdr-1.7.19/po/fr_FR.po
+--- vdr-1.7.19~/po/fr_FR.po 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/po/fr_FR.po 2011-06-19 20:00:31.000000000 +0200
+@@ -947,6 +947,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparence du fond"
@@ -526,11 +506,10 @@ index 0d4cb7c..770038e 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/hr_HR.po b/po/hr_HR.po
-index 96ee695..51f596c 100644
---- a/po/hr_HR.po
-+++ b/po/hr_HR.po
-@@ -942,6 +942,9 @@ msgstr "Transparentnost titla"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/hr_HR.po vdr-1.7.19/po/hr_HR.po
+--- vdr-1.7.19~/po/hr_HR.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/hr_HR.po 2011-06-19 20:00:31.000000000 +0200
+@@ -943,6 +943,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparentnost pozadine titla"
@@ -540,11 +519,10 @@ index 96ee695..51f596c 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/hu_HU.po b/po/hu_HU.po
-index a17b209..2f70812 100644
---- a/po/hu_HU.po
-+++ b/po/hu_HU.po
-@@ -943,6 +943,9 @@ msgstr "Felirat transzparenci
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/hu_HU.po vdr-1.7.19/po/hu_HU.po
+--- vdr-1.7.19~/po/hu_HU.po 2011-05-21 14:29:39.000000000 +0200
++++ vdr-1.7.19/po/hu_HU.po 2011-06-19 20:00:31.000000000 +0200
+@@ -944,6 +944,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Felirat hátterének transzparenciája"
@@ -554,11 +532,10 @@ index a17b209..2f70812 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/it_IT.po b/po/it_IT.po
-index 89d4237..5a055b2 100644
---- a/po/it_IT.po
-+++ b/po/it_IT.po
-@@ -947,6 +947,9 @@ msgstr "Trasparenza sottotitoli"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/it_IT.po vdr-1.7.19/po/it_IT.po
+--- vdr-1.7.19~/po/it_IT.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/it_IT.po 2011-06-19 20:00:31.000000000 +0200
+@@ -948,6 +948,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Trasparenza sfondo sottotitoli"
@@ -568,11 +545,10 @@ index 89d4237..5a055b2 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/lt_LT.po b/po/lt_LT.po
-index 02465e6..8b5d996 100644
---- a/po/lt_LT.po
-+++ b/po/lt_LT.po
-@@ -940,6 +940,9 @@ msgstr "Subtitrų priekinio vaizdo permatomumas"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/lt_LT.po vdr-1.7.19/po/lt_LT.po
+--- vdr-1.7.19~/po/lt_LT.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/lt_LT.po 2011-06-19 20:00:31.000000000 +0200
+@@ -941,6 +941,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Subtitrų fono permatomumas"
@@ -582,11 +558,10 @@ index 02465e6..8b5d996 100644
msgid "LNB"
msgstr "Konverteris (LNB)"
-diff --git a/po/nl_NL.po b/po/nl_NL.po
-index f570337..73a02b3 100644
---- a/po/nl_NL.po
-+++ b/po/nl_NL.po
-@@ -944,6 +944,9 @@ msgstr "Transparantie voorgrond ondertiteling"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/nl_NL.po vdr-1.7.19/po/nl_NL.po
+--- vdr-1.7.19~/po/nl_NL.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/nl_NL.po 2011-06-19 20:00:31.000000000 +0200
+@@ -945,6 +945,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparantie achtergrond ondertiteling"
@@ -596,11 +571,10 @@ index f570337..73a02b3 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/nn_NO.po b/po/nn_NO.po
-index 2f40cfe..0934c9a 100644
---- a/po/nn_NO.po
-+++ b/po/nn_NO.po
-@@ -941,6 +941,9 @@ msgstr ""
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/nn_NO.po vdr-1.7.19/po/nn_NO.po
+--- vdr-1.7.19~/po/nn_NO.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/nn_NO.po 2011-06-19 20:00:31.000000000 +0200
+@@ -942,6 +942,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr ""
@@ -610,11 +584,10 @@ index 2f40cfe..0934c9a 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/pl_PL.po b/po/pl_PL.po
-index 9620e1b..39057fd 100644
---- a/po/pl_PL.po
-+++ b/po/pl_PL.po
-@@ -941,6 +941,9 @@ msgstr "Prze
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/pl_PL.po vdr-1.7.19/po/pl_PL.po
+--- vdr-1.7.19~/po/pl_PL.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/pl_PL.po 2011-06-19 20:00:31.000000000 +0200
+@@ -942,6 +942,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Prze¼rocze podtytu³ów: T³o"
@@ -624,13 +597,12 @@ index 9620e1b..39057fd 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/pt_PT.po b/po/pt_PT.po
-index 0510d9d..3bea1f1 100644
---- a/po/pt_PT.po
-+++ b/po/pt_PT.po
-@@ -940,6 +940,9 @@ msgstr "Transpar
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/pt_PT.po vdr-1.7.19/po/pt_PT.po
+--- vdr-1.7.19~/po/pt_PT.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/pt_PT.po 2011-06-19 20:00:31.000000000 +0200
+@@ -942,6 +942,9 @@
msgid "Setup.DVB$Subtitle background transparency"
- msgstr "Transparência de background das legendas"
+ msgstr "Transparência de fundo das legendas"
+msgid "Setup.DVB$Enable teletext support"
+msgstr ""
@@ -638,11 +610,10 @@ index 0510d9d..3bea1f1 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/ro_RO.po b/po/ro_RO.po
-index e0a2119..1d4a412 100644
---- a/po/ro_RO.po
-+++ b/po/ro_RO.po
-@@ -943,6 +943,9 @@ msgstr "Transparen
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/ro_RO.po vdr-1.7.19/po/ro_RO.po
+--- vdr-1.7.19~/po/ro_RO.po 2011-05-21 14:29:39.000000000 +0200
++++ vdr-1.7.19/po/ro_RO.po 2011-06-19 20:00:31.000000000 +0200
+@@ -944,6 +944,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparenþa fundalului subtitrãrii"
@@ -652,11 +623,10 @@ index e0a2119..1d4a412 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/ru_RU.po b/po/ru_RU.po
-index 889b98b..89029e1 100644
---- a/po/ru_RU.po
-+++ b/po/ru_RU.po
-@@ -941,6 +941,9 @@ msgstr "
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/ru_RU.po vdr-1.7.19/po/ru_RU.po
+--- vdr-1.7.19~/po/ru_RU.po 2011-06-19 20:00:31.000000000 +0200
++++ vdr-1.7.19/po/ru_RU.po 2011-06-19 20:00:31.000000000 +0200
+@@ -942,6 +942,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "¿àÞ×àÐçÝÞáâì äÞÝÐ áãÑâØâàÞÒ"
@@ -666,11 +636,10 @@ index 889b98b..89029e1 100644
msgid "LNB"
msgstr "ºÞÝÒÕàâÕà"
-diff --git a/po/sk_SK.po b/po/sk_SK.po
-index 129fad3..eff0bd1 100644
---- a/po/sk_SK.po
-+++ b/po/sk_SK.po
-@@ -941,6 +941,9 @@ msgstr "Prieh
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/sk_SK.po vdr-1.7.19/po/sk_SK.po
+--- vdr-1.7.19~/po/sk_SK.po 2011-05-21 14:29:39.000000000 +0200
++++ vdr-1.7.19/po/sk_SK.po 2011-06-19 20:00:31.000000000 +0200
+@@ -941,6 +941,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Priehµadnos» pozadia titulkov"
@@ -680,11 +649,10 @@ index 129fad3..eff0bd1 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/sl_SI.po b/po/sl_SI.po
-index 9f1e806..7f2bdd7 100644
---- a/po/sl_SI.po
-+++ b/po/sl_SI.po
-@@ -941,6 +941,9 @@ msgstr "Transparentnost podnapisov"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/sl_SI.po vdr-1.7.19/po/sl_SI.po
+--- vdr-1.7.19~/po/sl_SI.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/sl_SI.po 2011-06-19 20:00:31.000000000 +0200
+@@ -942,6 +942,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparentnost ozadja podnapisov"
@@ -694,11 +662,10 @@ index 9f1e806..7f2bdd7 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/sv_SE.po b/po/sv_SE.po
-index e9d39dd..9c366d2 100644
---- a/po/sv_SE.po
-+++ b/po/sv_SE.po
-@@ -943,6 +943,9 @@ msgstr "Transparent f
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/sv_SE.po vdr-1.7.19/po/sv_SE.po
+--- vdr-1.7.19~/po/sv_SE.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/sv_SE.po 2011-06-19 20:00:31.000000000 +0200
+@@ -944,6 +944,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Transparent bakgrund textremsa"
@@ -708,11 +675,10 @@ index e9d39dd..9c366d2 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/tr_TR.po b/po/tr_TR.po
-index 9acd1c1..50a6295 100644
---- a/po/tr_TR.po
-+++ b/po/tr_TR.po
-@@ -940,6 +940,9 @@ msgstr "Altyaz
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/tr_TR.po vdr-1.7.19/po/tr_TR.po
+--- vdr-1.7.19~/po/tr_TR.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/tr_TR.po 2011-06-19 20:00:31.000000000 +0200
+@@ -941,6 +941,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "Altyazý arka þeffaflýk"
@@ -722,11 +688,10 @@ index 9acd1c1..50a6295 100644
msgid "LNB"
msgstr "LNB"
-diff --git a/po/uk_UA.po b/po/uk_UA.po
-index b62fca7..25e7095 100644
---- a/po/uk_UA.po
-+++ b/po/uk_UA.po
-@@ -940,6 +940,9 @@ msgstr "ПрозоріÑÑ‚ÑŒ переднього плану Ñубтитрів"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/uk_UA.po vdr-1.7.19/po/uk_UA.po
+--- vdr-1.7.19~/po/uk_UA.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/uk_UA.po 2011-06-19 20:00:31.000000000 +0200
+@@ -941,6 +941,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "ПрозоріÑÑ‚ÑŒ заднього плану Ñубтитрів"
@@ -736,11 +701,10 @@ index b62fca7..25e7095 100644
msgid "LNB"
msgstr "Конвертер"
-diff --git a/po/zh_CN.po b/po/zh_CN.po
-index bffa301..141c362 100644
---- a/po/zh_CN.po
-+++ b/po/zh_CN.po
-@@ -943,6 +943,9 @@ msgstr "å—幕å‰æ™¯é€æ˜Žåº¦"
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/po/zh_CN.po vdr-1.7.19/po/zh_CN.po
+--- vdr-1.7.19~/po/zh_CN.po 2011-05-21 14:29:38.000000000 +0200
++++ vdr-1.7.19/po/zh_CN.po 2011-06-19 20:00:31.000000000 +0200
+@@ -944,6 +944,9 @@
msgid "Setup.DVB$Subtitle background transparency"
msgstr "å—幕背景é€æ˜Žåº¦"
@@ -750,11 +714,10 @@ index bffa301..141c362 100644
msgid "LNB"
msgstr "切æ¢å™¨è®¾ç½®"
-diff --git a/receiver.c b/receiver.c
-index 58dda78..ed28f1b 100644
---- a/receiver.c
-+++ b/receiver.c
-@@ -82,7 +82,8 @@ bool cReceiver::SetPids(const cChannel *Channel)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/receiver.c vdr-1.7.19/receiver.c
+--- vdr-1.7.19~/receiver.c 2010-12-13 00:16:25.000000000 +0100
++++ vdr-1.7.19/receiver.c 2011-06-19 20:00:31.000000000 +0200
+@@ -81,7 +81,8 @@
(Channel->Ppid() == Channel->Vpid() || AddPid(Channel->Ppid())) &&
AddPids(Channel->Apids()) &&
AddPids(Channel->Dpids()) &&
@@ -764,11 +727,10 @@ index 58dda78..ed28f1b 100644
}
return true;
}
-diff --git a/remux.c b/remux.c
-index 5206544..eea5c07 100644
---- a/remux.c
-+++ b/remux.c
-@@ -215,6 +215,29 @@ int cPatPmtGenerator::MakeSubtitlingDescriptor(uchar *Target, const char *Langua
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/remux.c vdr-1.7.19/remux.c
+--- vdr-1.7.19~/remux.c 2011-06-12 16:24:09.000000000 +0200
++++ vdr-1.7.19/remux.c 2011-06-19 20:00:31.000000000 +0200
+@@ -216,6 +216,29 @@
return i;
}
@@ -798,7 +760,7 @@ index 5206544..eea5c07 100644
int cPatPmtGenerator::MakeLanguageDescriptor(uchar *Target, const char *Language)
{
int i = 0;
-@@ -302,6 +325,7 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
+@@ -303,6 +326,7 @@
if (Channel) {
int Vpid = Channel->Vpid();
int Ppid = Channel->Ppid();
@@ -806,7 +768,7 @@ index 5206544..eea5c07 100644
uchar *p = buf;
int i = 0;
p[i++] = 0x02; // table id
-@@ -334,6 +358,10 @@ void cPatPmtGenerator::GeneratePmt(const cChannel *Channel)
+@@ -335,6 +359,10 @@
i += MakeStream(buf + i, 0x06, Channel->Spid(n));
i += MakeSubtitlingDescriptor(buf + i, Channel->Slang(n), Channel->SubtitlingType(n), Channel->CompositionPageId(n), Channel->AncillaryPageId(n));
}
@@ -817,7 +779,7 @@ index 5206544..eea5c07 100644
int sl = i - SectionLength - 2 + 4; // -2 = SectionLength storage, +4 = length of CRC
buf[SectionLength] |= (sl >> 8) & 0x0F;
-@@ -407,6 +435,7 @@ void cPatPmtParser::Reset(void)
+@@ -408,6 +436,7 @@
pmtPid = -1;
vpid = vtype = 0;
ppid = 0;
@@ -825,7 +787,7 @@ index 5206544..eea5c07 100644
}
void cPatPmtParser::ParsePat(const uchar *Data, int Length)
-@@ -492,11 +521,13 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -493,11 +522,13 @@
int NumSpids = 0;
vpid = vtype = 0;
ppid = 0;
@@ -839,7 +801,7 @@ index 5206544..eea5c07 100644
SI::PMT::Stream stream;
for (SI::Loop::Iterator it; Pmt.streamLoop.getNext(stream, it); ) {
dbgpatpmt(" stream type = %02X, pid = %d", stream.getStreamType(), stream.getPid());
-@@ -595,6 +626,28 @@ void cPatPmtParser::ParsePmt(const uchar *Data, int Length)
+@@ -596,6 +627,28 @@
spids[NumSpids]= 0;
}
break;
@@ -868,11 +830,10 @@ index 5206544..eea5c07 100644
case SI::ISO639LanguageDescriptorTag: {
SI::ISO639LanguageDescriptor *ld = (SI::ISO639LanguageDescriptor *)d;
dbgpatpmt(" '%s'", ld->languageCode);
-diff --git a/remux.h b/remux.h
-index 7b62187..6f816dc 100644
---- a/remux.h
-+++ b/remux.h
-@@ -171,6 +171,7 @@ protected:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/remux.h vdr-1.7.19/remux.h
+--- vdr-1.7.19~/remux.h 2011-06-12 14:49:17.000000000 +0200
++++ vdr-1.7.19/remux.h 2011-06-19 20:00:31.000000000 +0200
+@@ -174,6 +174,7 @@
int MakeStream(uchar *Target, uchar Type, int Pid);
int MakeAC3Descriptor(uchar *Target, uchar Type);
int MakeSubtitlingDescriptor(uchar *Target, const char *Language, uchar SubtitlingType, uint16_t CompositionPageId, uint16_t AncillaryPageId);
@@ -880,7 +841,7 @@ index 7b62187..6f816dc 100644
int MakeLanguageDescriptor(uchar *Target, const char *Language);
int MakeCRC(uchar *Target, const uchar *Data, int Length);
void GeneratePmtPid(const cChannel *Channel);
-@@ -216,6 +217,7 @@ private:
+@@ -219,6 +220,7 @@
int vpid;
int ppid;
int vtype;
@@ -888,7 +849,7 @@ index 7b62187..6f816dc 100644
int apids[MAXAPIDS + 1]; // list is zero-terminated
int atypes[MAXAPIDS + 1]; // list is zero-terminated
char alangs[MAXAPIDS][MAXLANGCODE2];
-@@ -228,6 +230,8 @@ private:
+@@ -231,6 +233,8 @@
uint16_t compositionPageIds[MAXSPIDS];
uint16_t ancillaryPageIds[MAXSPIDS];
bool updatePrimaryDevice;
@@ -897,7 +858,7 @@ index 7b62187..6f816dc 100644
protected:
int SectionLength(const uchar *Data, int Length) { return (Length >= 3) ? ((int(Data[1]) & 0x0F) << 8)| Data[2] : 0; }
public:
-@@ -260,6 +264,9 @@ public:
+@@ -263,6 +267,9 @@
int Vtype(void) const { return vtype; }
///< Returns the video stream type as defined by the current PMT, or 0 if no video
///< stream type has been detected, yet.
@@ -907,7 +868,7 @@ index 7b62187..6f816dc 100644
const int *Apids(void) const { return apids; }
const int *Dpids(void) const { return dpids; }
const int *Spids(void) const { return spids; }
-@@ -274,6 +281,8 @@ public:
+@@ -277,6 +284,8 @@
uchar SubtitlingType(int i) const { return (0 <= i && i < MAXSPIDS) ? subtitlingTypes[i] : uchar(0); }
uint16_t CompositionPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? compositionPageIds[i] : uint16_t(0); }
uint16_t AncillaryPageId(int i) const { return (0 <= i && i < MAXSPIDS) ? ancillaryPageIds[i] : uint16_t(0); }
@@ -916,11 +877,10 @@ index 7b62187..6f816dc 100644
};
// TS to PES converter:
-diff --git a/vdr.5 b/vdr.5
-index 68711b5..9b8ed05 100644
---- a/vdr.5
-+++ b/vdr.5
-@@ -214,6 +214,13 @@ if there is an audio type.
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/vdr.5 vdr-1.7.19/vdr.5
+--- vdr-1.7.19~/vdr.5 2011-04-03 12:21:36.000000000 +0200
++++ vdr-1.7.19/vdr.5 2011-06-19 20:00:31.000000000 +0200
+@@ -214,6 +214,13 @@
.TP
.B TPID
The teletext PID.
@@ -934,11 +894,9 @@ index 68711b5..9b8ed05 100644
.TP
.B Conditional access
A hexadecimal integer defining how this channel can be accessed:
-diff --git a/vdrttxtsubshooks.c b/vdrttxtsubshooks.c
-new file mode 100644
-index 0000000..2471788
---- /dev/null
-+++ b/vdrttxtsubshooks.c
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/vdrttxtsubshooks.c vdr-1.7.19/vdrttxtsubshooks.c
+--- vdr-1.7.19~/vdrttxtsubshooks.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.7.19/vdrttxtsubshooks.c 2011-06-19 20:00:31.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * vdr-ttxtsubs - A plugin for the Linux Video Disk Recorder
@@ -1003,11 +961,9 @@ index 0000000..2471788
+ return &gProxy;
+}
+
-diff --git a/vdrttxtsubshooks.h b/vdrttxtsubshooks.h
-new file mode 100644
-index 0000000..2f97969
---- /dev/null
-+++ b/vdrttxtsubshooks.h
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/vdrttxtsubshooks.h vdr-1.7.19/vdrttxtsubshooks.h
+--- vdr-1.7.19~/vdrttxtsubshooks.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-1.7.19/vdrttxtsubshooks.h 2011-06-19 20:00:31.000000000 +0200
@@ -0,0 +1,46 @@
+/*
+ * vdr-ttxtsubs - A plugin for the Linux Video Disk Recorder
diff --git a/debian/patches/opt-39_noepg.dpatch b/debian/patches/opt-39_noepg.dpatch
index 7902fc1..90612cb 100644
--- a/debian/patches/opt-39_noepg.dpatch
+++ b/debian/patches/opt-39_noepg.dpatch
@@ -11,10 +11,10 @@
## DP: This is useful if you get epg data of the channels from external sources.
@DPATCH@
-diff -Naurp vdr-1.7.8/config.c vdr-1.7.8-noepg/config.c
---- vdr-1.7.8/config.c 2009-06-13 10:25:05.000000000 +0000
-+++ vdr-1.7.8-noepg/config.c 2009-06-15 21:04:42.000000000 +0000
-@@ -234,6 +234,8 @@ cSetup::cSetup(void)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/config.c vdr-1.7.19/config.c
+--- vdr-1.7.19~/config.c 2011-06-19 20:05:17.000000000 +0200
++++ vdr-1.7.19/config.c 2011-06-19 20:08:33.000000000 +0200
+@@ -329,6 +329,8 @@
SetSystemTime = 0;
TimeSource = 0;
TimeTransponder = 0;
@@ -23,8 +23,8 @@ diff -Naurp vdr-1.7.8/config.c vdr-1.7.8-noepg/config.c
MarginStart = 2;
MarginStop = 10;
AudioLanguages[0] = -1;
-@@ -302,9 +304,16 @@ cSetup::cSetup(void)
- EmergencyExit = 1;
+@@ -414,10 +416,17 @@
+ MenuCmdPosition = 0;
}
+cSetup::~cSetup()
@@ -35,12 +35,13 @@ diff -Naurp vdr-1.7.8/config.c vdr-1.7.8-noepg/config.c
cSetup& cSetup::operator= (const cSetup &s)
{
memcpy(&__BeginData__, &s.__BeginData__, (char *)&s.__EndData__ - (char *)&s.__BeginData__);
+ InitialChannel = s.InitialChannel;
+ free(noEPGList);
+ noEPGList = strdup(s.noEPGList);
return *this;
}
-@@ -421,6 +430,11 @@ bool cSetup::Parse(const char *Name, con
+@@ -534,6 +543,11 @@
else if (!strcasecmp(Name, "SetSystemTime")) SetSystemTime = atoi(Value);
else if (!strcasecmp(Name, "TimeSource")) TimeSource = cSource::FromString(Value);
else if (!strcasecmp(Name, "TimeTransponder")) TimeTransponder = atoi(Value);
@@ -52,7 +53,7 @@ diff -Naurp vdr-1.7.8/config.c vdr-1.7.8-noepg/config.c
else if (!strcasecmp(Name, "MarginStart")) MarginStart = atoi(Value);
else if (!strcasecmp(Name, "MarginStop")) MarginStop = atoi(Value);
else if (!strcasecmp(Name, "AudioLanguages")) return ParseLanguages(Value, AudioLanguages);
-@@ -513,6 +527,8 @@ bool cSetup::Save(void)
+@@ -643,6 +657,8 @@
Store("SetSystemTime", SetSystemTime);
Store("TimeSource", cSource::ToString(TimeSource));
Store("TimeTransponder", TimeTransponder);
@@ -61,10 +62,10 @@ diff -Naurp vdr-1.7.8/config.c vdr-1.7.8-noepg/config.c
Store("MarginStart", MarginStart);
Store("MarginStop", MarginStop);
StoreLanguages("AudioLanguages", AudioLanguages);
-diff -Naurp vdr-1.7.8/config.h vdr-1.7.8-noepg/config.h
---- vdr-1.7.8/config.h 2009-05-21 11:11:32.000000000 +0000
-+++ vdr-1.7.8-noepg/config.h 2009-06-15 21:02:48.000000000 +0000
-@@ -218,6 +218,7 @@ public:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/config.h vdr-1.7.19/config.h
+--- vdr-1.7.19~/config.h 2011-06-19 20:05:17.000000000 +0200
++++ vdr-1.7.19/config.h 2011-06-19 20:06:21.000000000 +0200
+@@ -236,6 +236,7 @@
int SetSystemTime;
int TimeSource;
int TimeTransponder;
@@ -72,19 +73,19 @@ diff -Naurp vdr-1.7.8/config.h vdr-1.7.8-noepg/config.h
int MarginStart, MarginStop;
int AudioLanguages[I18N_MAX_LANGUAGES + 1];
int DisplaySubtitles;
-@@ -274,7 +275,9 @@ public:
- int InitialVolume;
- int EmergencyExit;
+@@ -305,7 +306,9 @@
+ int ShowRecDate, ShowRecTime, ShowRecLength, ShowProgressBar, MenuCmdPosition;
int __EndData__;
+ cString InitialChannel;
+ char *noEPGList; // pointer not to be flat-copied
cSetup(void);
+ ~cSetup();
cSetup& operator= (const cSetup &s);
bool Load(const char *FileName);
bool Save(void);
-diff -Naurp vdr-1.7.8/eit.c vdr-1.7.8-noepg/eit.c
---- vdr-1.7.8/eit.c 2009-05-15 12:34:43.000000000 +0000
-+++ vdr-1.7.8-noepg/eit.c 2009-06-15 20:43:10.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/eit.c vdr-1.7.19/eit.c
+--- vdr-1.7.19~/eit.c 2011-06-19 20:05:17.000000000 +0200
++++ vdr-1.7.19/eit.c 2011-06-19 20:05:17.000000000 +0200
@@ -24,8 +24,28 @@
class cEIT : public SI::EIT {
public:
@@ -114,7 +115,7 @@ diff -Naurp vdr-1.7.8/eit.c vdr-1.7.8-noepg/eit.c
cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bool OnlyRunningStatus)
:SI::EIT(Data, false)
{
-@@ -37,6 +57,12 @@ cEIT::cEIT(cSchedules *Schedules, int So
+@@ -37,6 +57,12 @@
if (!channel)
return; // only collect data for known channels
@@ -127,10 +128,10 @@ diff -Naurp vdr-1.7.8/eit.c vdr-1.7.8-noepg/eit.c
cSchedule *pSchedule = (cSchedule *)Schedules->GetSchedule(channel, true);
bool Empty = true;
-diff -Naurp vdr-1.7.8/menu.c vdr-1.7.8-noepg/menu.c
---- vdr-1.7.8/menu.c 2009-05-21 11:10:38.000000000 +0000
-+++ vdr-1.7.8-noepg/menu.c 2009-06-15 21:06:02.000000000 +0000
-@@ -2289,6 +2289,7 @@ eOSState cMenuSetupOSD::ProcessKey(eKeys
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/menu.c vdr-1.7.19/menu.c
+--- vdr-1.7.19~/menu.c 2011-06-19 20:05:17.000000000 +0200
++++ vdr-1.7.19/menu.c 2011-06-19 20:05:17.000000000 +0200
+@@ -2850,6 +2850,7 @@
class cMenuSetupEPG : public cMenuSetupBase {
private:
@@ -138,7 +139,7 @@ diff -Naurp vdr-1.7.8/menu.c vdr-1.7.8-noepg/menu.c
int originalNumLanguages;
int numLanguages;
void Setup(void);
-@@ -2311,6 +2312,9 @@ void cMenuSetupEPG::Setup(void)
+@@ -2872,6 +2873,9 @@
{
int current = Current();
@@ -148,7 +149,7 @@ diff -Naurp vdr-1.7.8/menu.c vdr-1.7.8-noepg/menu.c
Clear();
Add(new cMenuEditIntItem( tr("Setup.EPG$EPG scan timeout (h)"), &data.EPGScanTimeout));
-@@ -2319,6 +2323,7 @@ void cMenuSetupEPG::Setup(void)
+@@ -2881,6 +2885,7 @@
Add(new cMenuEditBoolItem(tr("Setup.EPG$Set system time"), &data.SetSystemTime));
if (data.SetSystemTime)
Add(new cMenuEditTranItem(tr("Setup.EPG$Use time from transponder"), &data.TimeTransponder, &data.TimeSource));
diff --git a/debian/patches/opt-44_rotor.dpatch b/debian/patches/opt-44_rotor.dpatch
index 9c5e2a5..a6a8e91 100644
--- a/debian/patches/opt-44_rotor.dpatch
+++ b/debian/patches/opt-44_rotor.dpatch
@@ -13,9 +13,9 @@
## DP: This patch is needed for the rotor plugin.
@DPATCH@
-diff -Naurp vdr-1.7.13/device.h vdr-1.7.13-rotor/device.h
---- vdr-1.7.13/device.h 2010-02-06 14:34:41.000000000 +0000
-+++ vdr-1.7.13-rotor/device.h 2010-02-28 18:40:19.000000000 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/device.h vdr-1.7.19/device.h
+--- vdr-1.7.19~/device.h 2011-06-19 20:09:49.000000000 +0200
++++ vdr-1.7.19/device.h 2011-06-19 20:09:50.000000000 +0200
@@ -24,6 +24,8 @@
#include "spu.h"
#include "thread.h"
@@ -25,7 +25,7 @@ diff -Naurp vdr-1.7.13/device.h vdr-1.7.13-rotor/device.h
#define MAXDEVICES 16 // the maximum number of devices in the system
#define MAXPIDHANDLES 64 // the maximum number of different PIDs per device
-@@ -289,6 +291,7 @@ public:
+@@ -305,6 +307,7 @@
virtual bool HasProgramme(void);
///< Returns true if the device is currently showing any programme to
///< the user, either through replaying or live.
@@ -33,10 +33,10 @@ diff -Naurp vdr-1.7.13/device.h vdr-1.7.13-rotor/device.h
// PID handle facilities
-diff -Naurp vdr-1.7.13/dvbdevice.c vdr-1.7.13-rotor/dvbdevice.c
---- vdr-1.7.13/dvbdevice.c 2010-02-21 17:10:35.000000000 +0000
-+++ vdr-1.7.13-rotor/dvbdevice.c 2010-02-28 18:43:41.000000000 +0000
-@@ -244,6 +244,7 @@ bool cDvbTransponderParameters::Parse(co
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/dvbdevice.c vdr-1.7.19/dvbdevice.c
+--- vdr-1.7.19~/dvbdevice.c 2011-06-11 16:34:24.000000000 +0200
++++ vdr-1.7.19/dvbdevice.c 2011-06-19 20:12:51.000000000 +0200
+@@ -258,6 +258,7 @@
class cDvbTuner : public cThread {
private:
enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
@@ -44,21 +44,23 @@ diff -Naurp vdr-1.7.13/dvbdevice.c vdr-1.7.13-rotor/dvbdevice.c
int device;
int fd_frontend;
int adapter, frontend;
-@@ -257,6 +258,7 @@ private:
+@@ -272,6 +273,7 @@
cMutex mutex;
cCondVar locked;
cCondVar newSet;
+ dvb_diseqc_master_cmd diseqc_cmd;
- bool GetFrontendStatus(fe_status_t &Status, int TimeoutMs = 0);
+ void ClearEventQueue(void) const;
+ bool GetFrontendStatus(fe_status_t &Status) const;
bool SetFrontend(void);
- virtual void Action(void);
-@@ -266,11 +268,13 @@ public:
- const cChannel *GetTransponder(void) const { return &channel; }
+@@ -283,6 +285,7 @@
+ uint32_t SubsystemId(void) const { return subsystemId; }
bool IsTunedTo(const cChannel *Channel) const;
void Set(const cChannel *Channel);
+ bool SendDiseqcCmd(dvb_diseqc_master_cmd cmd);
bool Locked(int TimeoutMs = 0);
- };
+ int GetSignalStrength(void) const;
+ int GetSignalQuality(void) const;
+@@ -290,6 +293,7 @@
cDvbTuner::cDvbTuner(int Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
{
@@ -66,8 +68,8 @@ diff -Naurp vdr-1.7.13/dvbdevice.c vdr-1.7.13-rotor/dvbdevice.c
device = Device;
fd_frontend = Fd_Frontend;
adapter = Adapter;
-@@ -327,6 +331,17 @@ bool cDvbTuner::Locked(int TimeoutMs)
- return tunerStatus >= tsLocked;
+@@ -357,6 +361,17 @@
+ }
}
+bool cDvbTuner::SendDiseqcCmd(dvb_diseqc_master_cmd cmd)
@@ -81,11 +83,11 @@ diff -Naurp vdr-1.7.13/dvbdevice.c vdr-1.7.13-rotor/dvbdevice.c
+ return true;
+}
+
- bool cDvbTuner::GetFrontendStatus(fe_status_t &Status, int TimeoutMs)
+ bool cDvbTuner::GetFrontendStatus(fe_status_t &Status) const
{
- if (TimeoutMs) {
-@@ -508,6 +523,10 @@ void cDvbTuner::Action(void)
- if (GetFrontendStatus(NewStatus, 10))
+ ClearEventQueue();
+@@ -647,6 +662,10 @@
+ if (GetFrontendStatus(NewStatus))
Status = NewStatus;
cMutexLock MutexLock(&mutex);
+ if (SendDiseqc) {
@@ -95,7 +97,7 @@ diff -Naurp vdr-1.7.13/dvbdevice.c vdr-1.7.13-rotor/dvbdevice.c
switch (tunerStatus) {
case tsIdle:
break;
-@@ -942,6 +961,11 @@ bool cDvbDevice::HasLock(int TimeoutMs)
+@@ -1118,6 +1137,11 @@
return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
}
@@ -107,10 +109,10 @@ diff -Naurp vdr-1.7.13/dvbdevice.c vdr-1.7.13-rotor/dvbdevice.c
void cDvbDevice::SetTransferModeForDolbyDigital(int Mode)
{
setTransferModeForDolbyDigital = Mode;
-diff -Naurp vdr-1.7.13/dvbdevice.h vdr-1.7.13-rotor/dvbdevice.h
---- vdr-1.7.13/dvbdevice.h 2010-02-21 14:06:08.000000000 +0000
-+++ vdr-1.7.13-rotor/dvbdevice.h 2010-02-28 18:40:19.000000000 +0000
-@@ -146,6 +146,7 @@ protected:
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vdr-1.7.19~/dvbdevice.h vdr-1.7.19/dvbdevice.h
+--- vdr-1.7.19~/dvbdevice.h 2011-06-02 15:20:05.000000000 +0200
++++ vdr-1.7.19/dvbdevice.h 2011-06-19 20:09:50.000000000 +0200
+@@ -149,6 +149,7 @@
virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
public:
virtual bool HasLock(int TimeoutMs = 0);
--
vdr packaging repository
More information about the pkg-vdr-dvb-changes
mailing list