Merge branch 'master' into experimental

diff --combined lib/service/servicedvb.cpp
index e77cbc5,f1858c9..6a464af
--- 1/lib/service/servicedvb.cpp
--- 2/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@@ -309,7 -309,9 +309,9 @@@ eStaticServiceDVBPVRInformation::eStati
  RESULT eStaticServiceDVBPVRInformation::getName(const eServiceReference &ref, std::string &name)
  {
        ASSERT(ref == m_ref);
-       if (m_parser.m_name.size())
+       if (!ref.name.empty())
+               name = ref.name;
+       else if (!m_parser.m_name.empty())
                name = m_parser.m_name;
        else
        {
@@@ -1589,7 -1591,7 +1591,7 @@@ int eDVBServicePlay::getInfo(int w
  {
        eDVBServicePMTHandler::program program;
  
 -      if (w == sCAIDs)
 +      if (w == sCAIDs || w == sCAIDPIDs)
                return resIsPyObject;
  
        eDVBServicePMTHandler &h = m_timeshift_active ? m_service_handler_timeshift : m_service_handler;
@@@ -1730,8 -1732,6 +1732,8 @@@ PyObject *eDVBServicePlay::getInfoObjec
        {
        case sCAIDs:
                return m_service_handler.getCaIds();
 +      case sCAIDPIDs:
 +              return m_service_handler.getCaIds(true);
        case sTransponderData:
                return eStaticServiceDVBInformation().getInfoObject(m_reference, w);
        default: