aboutsummaryrefslogtreecommitdiff
path: root/lib/service/servicedvb.cpp
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2010-12-13 13:24:59 +0100
committerghost <andreas.monzner@multimedia-labs.de>2010-12-13 13:24:59 +0100
commit0b019e9dd85ac88917984e90a9e27ae4cb496b0b (patch)
tree900b3d046bd3e274e3a4fafa893ffcff993287dd /lib/service/servicedvb.cpp
parent36b4f5eccf81cc7a650d3bbfcc975d42b3d905c4 (diff)
parent26e11cd67e0bbfebd41b860a008f240d3d1b3052 (diff)
downloadenigma2-0b019e9dd85ac88917984e90a9e27ae4cb496b0b.tar.gz
enigma2-0b019e9dd85ac88917984e90a9e27ae4cb496b0b.zip
Merge branch 'bug_621_caid_info'
Diffstat (limited to 'lib/service/servicedvb.cpp')
-rw-r--r--lib/service/servicedvb.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index f1858c9c..6a464aff 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -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;
@@ -1732,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: