X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/01da0bdcc7d4043dbab99ad19443e5860c72da79..09eaa1b41d5b74464ad83eda66be50689247074f:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 0d617c30..914d6bf1 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -309,7 +309,9 @@ eStaticServiceDVBPVRInformation::eStaticServiceDVBPVRInformation(const eServiceR
 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
 	{
@@ -903,7 +905,7 @@ RESULT eServiceFactoryDVB::lookupService(ePtr<eDVBService> &service, const eServ
 		/* we are sure to have a ..DVB reference as the info() call was forwarded here according to it's ID. */
 		if ((err = db->getService((eServiceReferenceDVB&)ref, service)) != 0)
 		{
-			eDebug("getService failed!");
+//			eDebug("getService failed!");
 			return err;
 		}
 	}
@@ -1589,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,6 +1732,8 @@ PyObject *eDVBServicePlay::getInfoObject(int w)
 	{
 	case sCAIDs:
 		return m_service_handler.getCaIds();
+	case sCAIDPIDs:
+		return m_service_handler.getCaIds(true);
 	case sTransponderData:
 		return eStaticServiceDVBInformation().getInfoObject(m_reference, w);
 	default:
@@ -2399,7 +2403,7 @@ void eDVBServicePlay::updateDecoder(bool sendSeekableStateChanged)
 		eDebug("getting program info failed.");
 	else
 	{
-		eDebugNoNewLine("have %d video stream(s)", program.videoStreams.size());
+		eDebugNoNewLine("have %zd video stream(s)", program.videoStreams.size());
 		if (!program.videoStreams.empty())
 		{
 			eDebugNoNewLine(" (");
@@ -2418,7 +2422,7 @@ void eDVBServicePlay::updateDecoder(bool sendSeekableStateChanged)
 			}
 			eDebugNoNewLine(")");
 		}
-		eDebugNoNewLine(", and %d audio stream(s)", program.audioStreams.size());
+		eDebugNoNewLine(", and %zd audio stream(s)", program.audioStreams.size());
 		if (!program.audioStreams.empty())
 		{
 			eDebugNoNewLine(" (");
@@ -2595,7 +2599,7 @@ void eDVBServicePlay::loadCuesheet()
 			m_cue_entries.insert(cueEntry(where, what));
 		}
 		fclose(f);
-		eDebug("%d entries", m_cue_entries.size());
+		eDebug("%zd entries", m_cue_entries.size());
 	} else
 		eDebug("cutfile not found!");