git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version: use compile date if commit date is unavailable. default to "(no branch)"
[enigma2.git]
/
lib
/
service
/
servicedvb.cpp
diff --git
a/lib/service/servicedvb.cpp
b/lib/service/servicedvb.cpp
index 0d617c3043e984cbbb8d20022148f31407af94e0..6a464aff87934fc30f2f2c7aee15a6ee1949a336 100644
(file)
--- 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);
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
{
name = m_parser.m_name;
else
{
@@
-1589,7
+1591,7
@@
int eDVBServicePlay::getInfo(int w)
{
eDVBServicePMTHandler::program program;
{
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;
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 sCAIDs:
return m_service_handler.getCaIds();
+ case sCAIDPIDs:
+ return m_service_handler.getCaIds(true);
case sTransponderData:
return eStaticServiceDVBInformation().getInfoObject(m_reference, w);
default:
case sTransponderData:
return eStaticServiceDVBInformation().getInfoObject(m_reference, w);
default: