diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-12-13 13:24:59 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-12-13 13:24:59 +0100 |
| commit | 0b019e9dd85ac88917984e90a9e27ae4cb496b0b (patch) | |
| tree | 900b3d046bd3e274e3a4fafa893ffcff993287dd /lib/service | |
| parent | 36b4f5eccf81cc7a650d3bbfcc975d42b3d905c4 (diff) | |
| parent | 26e11cd67e0bbfebd41b860a008f240d3d1b3052 (diff) | |
| download | enigma2-0b019e9dd85ac88917984e90a9e27ae4cb496b0b.tar.gz enigma2-0b019e9dd85ac88917984e90a9e27ae4cb496b0b.zip | |
Merge branch 'bug_621_caid_info'
Diffstat (limited to 'lib/service')
| -rw-r--r-- | lib/service/iservice.h | 1 | ||||
| -rw-r--r-- | lib/service/servicedvb.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/service/iservice.h b/lib/service/iservice.h index 2ba7cb46..7f582495 100644 --- a/lib/service/iservice.h +++ b/lib/service/iservice.h @@ -289,6 +289,7 @@ public: sFileSize, sCAIDs, + sCAIDPIDs, sVideoType, /* MPEG2 MPEG4 */ sTags, /* space seperated list of tags */ 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: |