Merge branch 'bug_621_caid_info' into experimental

diff --cc lib/dvb/pmt.cpp
index ee6bb19,be4fb17..d673384
--- 1/lib/dvb/pmt.cpp
--- 2/lib/dvb/pmt.cpp
+++ b/lib/dvb/pmt.cpp
@@@ -242,29 -230,8 +246,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(pair);
 +                              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