for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i)
{
const ProgramMapSection &pmt = **i;
+ int is_hdmv = 0;
+
program.pcrPid = pmt.getPcrPid();
- program.caids.insert(descr->getCaSystemId());
+ for (DescriptorConstIterator desc = pmt.getDescriptors()->begin();
+ desc != pmt.getDescriptors()->end(); ++desc)
+ {
+ if ((*desc)->getTag() == CA_DESCRIPTOR)
+ {
+ CaDescriptor *descr = (CaDescriptor*)(*desc);
++ program::capid_pair pair;
++ pair.caid = descr->getCaSystemId();
++ pair.capid = descr->getCaPid();
++ program.caids.push_back(pair);
+ }
+ else if ((*desc)->getTag() == REGISTRATION_DESCRIPTOR)
+ {
+ RegistrationDescriptor *d = (RegistrationDescriptor*)(*desc);
+ if (d->getFormatIdentifier() == 0x48444d56) // HDMV
+ is_hdmv = 1;
+ }
+ }
+
ElementaryStreamInfoConstIterator es;
for (es = pmt.getEsInfo()->begin(); es != pmt.getEsInfo()->end(); ++es)
{
noinst_LIBRARIES = libenigma_service.a
libenigma_service_a_SOURCES = \
- listboxservice.cpp service.cpp servicemp3.cpp servicedvb.cpp servicefs.cpp \
- servicem2ts.cpp event.cpp servicedvbrecord.cpp
+ event.cpp \
+ listboxservice.cpp \
+ service.cpp \
+ servicedvb.cpp \
+ servicedvbrecord.cpp \
+ servicefs.cpp \
- servicemp3.cpp
++ servicemp3.cpp \
++ servicem2ts.cpp
+
+serviceincludedir = $(pkgincludedir)/lib/service
+serviceinclude_HEADERS = \
+ event.h \
+ iservice.h \
+ listboxservice.h \
+ service.h \
+ servicedvb.h \
+ servicedvbrecord.h \
+ servicefs.h \
- servicemp3.h
++ servicemp3.h \
++ servicem2ts.h
+
+if HAVE_LIBXINE
+libenigma_service_a_SOURCES += \
+ servicexine.cpp
+serviceinclude_HEADERS += \
+ servicexine.h
+endif