From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 26 Nov 2010 14:02:25 +0000 (+0100)
Subject: Merge branch 'bug_124_m2ts_support' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=d98f00f0fdd8b95b819b17c1d4779610c657c198

Merge branch 'bug_124_m2ts_support' into experimental

Conflicts:
	lib/dvb/pmt.cpp
	lib/service/Makefile.am
---

d98f00f0fdd8b95b819b17c1d4779610c657c198
diff --cc lib/dvb/pmt.cpp
index 0de78b4,d44766f..d6f2685
--- a/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@@ -226,8 -229,26 +242,29 @@@ int eDVBServicePMTHandler::getProgramIn
  			for (i = ptr->getSections().begin(); i != ptr->getSections().end(); ++i)
  			{
  				const ProgramMapSection &pmt = **i;
+ 				int is_hdmv = 0;
+ 
  				program.pcrPid = pmt.getPcrPid();
  
+ 				for (DescriptorConstIterator desc = pmt.getDescriptors()->begin();
+ 					desc != pmt.getDescriptors()->end(); ++desc)
+ 				{
+ 					if ((*desc)->getTag() == CA_DESCRIPTOR)
+ 					{
+ 						CaDescriptor *descr = (CaDescriptor*)(*desc);
 -						program.caids.insert(descr->getCaSystemId());
++						program::capid_pair pair;
++						pair.caid = descr->getCaSystemId();
++						pair.capid = descr->getCaPid();
++						program.caids.insert(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)
  				{
diff --cc lib/service/Makefile.am
index edafd1a,795900a..9f956b6
--- a/lib/service/Makefile.am
+++ b/lib/service/Makefile.am
@@@ -10,28 -4,5 +10,30 @@@ AM_CXXFLAGS = 
  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