mirror of
https://github.com/vdr-projects/vdr.git
synced 2025-03-01 10:50:46 +00:00
- Fixed some typos in the Makefile's 'font' target (thanks to Uwe Hanke). - Added more checks and polling when getting frontend events (based on a patch from Werner Fink). - No longer explicitly waiting for a tuner lock when switching channels (apparently setting "live" PIDs before the tuner is locked doesn't hurt). Moved the wait into cDevice::AttachReceiver() instead. - Immediately displaying the new channel info when switching channel groups. - Moved the main program loop variables further up to allow compilation with older compiler versions (thanks to Marco Schlüßler for reporting this one). - Now calling pthread_cond_broadcast() in the destructor of cCondWait and cCondVar to make sure any sleepers will wake up (suggested by Werner Fink). Also using pthread_cond_broadcast() instead of pthread_cond_signal() in cCondWait, in case there is more than one sleeper. - Making sure that timers and channels are only saved together, in a consistent manner (thanks to Mirko Dölle for reporting a problem with inconsistent channel and timer lists). - Now handling the channel name, short name and provider separately. cChannel therefore has two new functions, ShortName() and Provider(). ShortName() can be used to display a short version of the name (in case such a version is available). The optional boolean parameter of ShortName() can be set to true to make it return the name, if no short name is available. The sequence of 'name' and 'short name' in the channels.conf file has been swapped (see man vdr(5)). - Added the 'portal name' to cChannels (thanks to Marco Schlüßler). - Fixed handling key codes that start with 0x1B in the KBD remote control code. - Now using qsort() to sort cListBase lists. For this, the virtual function cListObject::operator<() has been replaced with cListObject::Compare(). Plugins that implement derived cListObject classes may need to adjust their code. - The "Channels" menu can now be sorted "by number" (default), "by name" and "by provider". While in the "Channels" menu, pressing the '0' key switches through these modes. - Fixed the buffer size in cRecording::SortName(). - Now displaying the name of the remote control for which the keys are being learned inside the menu to avoid overwriting the date/time in the 'classic' skin (thanks to Oliver Endriss for reporting this one).
127 lines
5.4 KiB
C
127 lines
5.4 KiB
C
/*
|
|
* sdt.c: SDT section filter
|
|
*
|
|
* See the main source file 'vdr.c' for copyright information and
|
|
* how to reach the author.
|
|
*
|
|
* $Id: sdt.c 1.13 2004/10/31 12:10:20 kls Exp $
|
|
*/
|
|
|
|
#include "sdt.h"
|
|
#include "channels.h"
|
|
#include "config.h"
|
|
#include "libsi/section.h"
|
|
#include "libsi/descriptor.h"
|
|
|
|
// --- cSdtFilter ------------------------------------------------------------
|
|
|
|
cSdtFilter::cSdtFilter(cPatFilter *PatFilter)
|
|
{
|
|
patFilter = PatFilter;
|
|
Set(0x11, 0x42); // SDT
|
|
}
|
|
|
|
void cSdtFilter::SetStatus(bool On)
|
|
{
|
|
cFilter::SetStatus(On);
|
|
sectionSyncer.Reset();
|
|
}
|
|
|
|
void cSdtFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
|
|
{
|
|
if (!(Source() && Transponder()))
|
|
return;
|
|
SI::SDT sdt(Data, false);
|
|
if (!sdt.CheckCRCAndParse())
|
|
return;
|
|
if (!sectionSyncer.Sync(sdt.getVersionNumber(), sdt.getSectionNumber(), sdt.getLastSectionNumber()))
|
|
return;
|
|
if (!Channels.Lock(true, 10))
|
|
return;
|
|
SI::SDT::Service SiSdtService;
|
|
for (SI::Loop::Iterator it; sdt.serviceLoop.getNext(SiSdtService, it); ) {
|
|
cChannel *channel = Channels.GetByChannelID(tChannelID(Source(), sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId()));
|
|
if (!channel)
|
|
channel = Channels.GetByChannelID(tChannelID(Source(), 0, Transponder(), SiSdtService.getServiceId()));
|
|
|
|
cLinkChannels *LinkChannels = NULL;
|
|
SI::Descriptor *d;
|
|
for (SI::Loop::Iterator it2; (d = SiSdtService.serviceDescriptors.getNext(it2)); ) {
|
|
switch (d->getDescriptorTag()) {
|
|
case SI::ServiceDescriptorTag: {
|
|
SI::ServiceDescriptor *sd = (SI::ServiceDescriptor *)d;
|
|
switch (sd->getServiceType()) {
|
|
case 0x01: // digital television service
|
|
case 0x02: // digital radio sound service
|
|
case 0x04: // NVOD reference service
|
|
case 0x05: // NVOD time-shifted service
|
|
{
|
|
char NameBuf[1024];
|
|
char ShortNameBuf[1024];
|
|
char ProviderNameBuf[1024];
|
|
sd->serviceName.getText(NameBuf, ShortNameBuf, sizeof(NameBuf), sizeof(ShortNameBuf));
|
|
char *pn = compactspace(NameBuf);
|
|
char *ps = compactspace(ShortNameBuf);
|
|
sd->providerName.getText(ProviderNameBuf, sizeof(ProviderNameBuf));
|
|
char *pp = compactspace(ProviderNameBuf);
|
|
if (channel) {
|
|
channel->SetId(sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
|
|
if (Setup.UpdateChannels >= 1)
|
|
channel->SetName(pn, ps, pp);
|
|
// Using SiSdtService.getFreeCaMode() is no good, because some
|
|
// tv stations set this flag even for non-encrypted channels :-(
|
|
// The special value 0xFFFF was supposed to mean "unknown encryption"
|
|
// and would have been overwritten with real CA values later:
|
|
// channel->SetCa(SiSdtService.getFreeCaMode() ? 0xFFFF : 0);
|
|
}
|
|
else if (*pn && Setup.UpdateChannels >= 3) {
|
|
channel = Channels.NewChannel(Channel(), pn, ps, pp, sdt.getOriginalNetworkId(), sdt.getTransportStreamId(), SiSdtService.getServiceId());
|
|
patFilter->Trigger();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
// Using the CaIdentifierDescriptor is no good, because some tv stations
|
|
// just don't use it. The actual CA values are collected in pat.c:
|
|
/*
|
|
case SI::CaIdentifierDescriptorTag: {
|
|
SI::CaIdentifierDescriptor *cid = (SI::CaIdentifierDescriptor *)d;
|
|
if (channel) {
|
|
for (SI::Loop::Iterator it; cid->identifiers.hasNext(it); )
|
|
channel->SetCa(cid->identifiers.getNext(it));
|
|
}
|
|
}
|
|
break;
|
|
*/
|
|
case SI::NVODReferenceDescriptorTag: {
|
|
SI::NVODReferenceDescriptor *nrd = (SI::NVODReferenceDescriptor *)d;
|
|
SI::NVODReferenceDescriptor::Service Service;
|
|
for (SI::Loop::Iterator it; nrd->serviceLoop.getNext(Service, it); ) {
|
|
cChannel *link = Channels.GetByChannelID(tChannelID(Source(), Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId()));
|
|
if (!link && Setup.UpdateChannels >= 3) {
|
|
link = Channels.NewChannel(Channel(), "NVOD", "", "", Service.getOriginalNetworkId(), Service.getTransportStream(), Service.getServiceId());
|
|
patFilter->Trigger();
|
|
}
|
|
if (link) {
|
|
if (!LinkChannels)
|
|
LinkChannels = new cLinkChannels;
|
|
LinkChannels->Add(new cLinkChannel(link));
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
default: ;
|
|
}
|
|
delete d;
|
|
}
|
|
if (LinkChannels) {
|
|
if (channel)
|
|
channel->SetLinkChannels(LinkChannels);
|
|
else
|
|
delete LinkChannels;
|
|
}
|
|
}
|
|
Channels.Unlock();
|
|
}
|