diff options
author | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2003-02-02 18:00:00 +0100 |
---|---|---|
committer | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2003-02-02 18:00:00 +0100 |
commit | 8c5d735d3279230f6471e474a946a5733054df43 (patch) | |
tree | 34f72e8bcb3a8fc93a9e6cc752fc19f6d95ce7e7 /dvbdevice.c | |
parent | a3942b4d17a3a7e1af82b1950c39db1f9c7ce250 (diff) | |
download | vdr-patch-lnbsharing-8c5d735d3279230f6471e474a946a5733054df43.tar.gz vdr-patch-lnbsharing-8c5d735d3279230f6471e474a946a5733054df43.tar.bz2 |
Version 1.1.23vdr-1.1.23
- Fixed a new/delete malloc/free mismatch in ringbuffer.c (thanks to Stefan
Huelswitt for reporting this one).
- Improved CAM handling.
Diffstat (limited to 'dvbdevice.c')
-rw-r--r-- | dvbdevice.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/dvbdevice.c b/dvbdevice.c index 2e12f26..1ffe067 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 1.41 2003/01/06 14:44:27 kls Exp $ + * $Id: dvbdevice.c 1.42 2003/02/02 15:31:31 kls Exp $ */ #include "dvbdevice.h" @@ -263,22 +263,15 @@ void cDvbTuner::Action(void) int length = cSIProcessor::GetCaDescriptors(channel.Source(), channel.Frequency(), channel.Sid(), sizeof(buffer), buffer); if (length > 0) { cCiCaPmt CaPmt(channel.Sid()); - if (channel.Vpid()) { + CaPmt.AddCaDescriptor(length, buffer); + if (channel.Vpid()) CaPmt.AddPid(channel.Vpid()); - CaPmt.AddCaDescriptor(length, buffer); - } - if (channel.Apid1()) { + if (channel.Apid1()) CaPmt.AddPid(channel.Apid1()); - CaPmt.AddCaDescriptor(length, buffer); - } - if (channel.Apid2()) { + if (channel.Apid2()) CaPmt.AddPid(channel.Apid2()); - CaPmt.AddCaDescriptor(length, buffer); - } - if (channel.Dpid1()) { + if (channel.Dpid1()) CaPmt.AddPid(channel.Dpid1()); - CaPmt.AddCaDescriptor(length, buffer); - } caSet = ciHandler->SetCaPmt(CaPmt); } } |