Merge branch 'bug_124_m2ts_support'

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

diff --cc lib/dvb/esection.h
Simple merge

diff --cc lib/dvb/pmt.cpp
index ca56141,dc2e9a8..4ad4e76
--- 1/lib/dvb/pmt.cpp
--- 2/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@@ -230,8 -244,26 +261,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();
  
 -                                              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)
                                {

diff --cc lib/dvb/pmt.h
Simple merge

diff --cc lib/dvb/tstools.cpp
Simple merge

diff --cc lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index b44a247,d61dbc7..6ff1c5a
mode 100644,100755..100644
--- 1/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
--- 2/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py

diff --cc lib/service/Makefile.am
index edafd1a,795900a..9f956b6
--- 1/lib/service/Makefile.am
--- 2/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

diff --cc lib/service/servicedvb.cpp
Simple merge