diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-22 16:19:51 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-22 16:19:51 +0100 |
| commit | 75a14a64a63132874f26b4715cde33e69dbf4b34 (patch) | |
| tree | bed899e3a6640f7a915faae2ba4ed9d873565370 /lib/dvb/pmt.h | |
| parent | fb91533bb1d293bdb0691bfcc1d15da9268782fe (diff) | |
| download | enigma2-75a14a64a63132874f26b4715cde33e69dbf4b34.tar.gz enigma2-75a14a64a63132874f26b4715cde33e69dbf4b34.zip | |
add possibility to query CAID/CAPID combination from python
refs bug #621
Diffstat (limited to 'lib/dvb/pmt.h')
| -rw-r--r-- | lib/dvb/pmt.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h index 483c06b1..4a506a41 100644 --- a/lib/dvb/pmt.h +++ b/lib/dvb/pmt.h @@ -181,11 +181,17 @@ public: struct program { + struct capid_pair + { + uint16_t caid; + int capid; + bool operator< (const struct capid_pair &t) { return t.caid < caid; } + }; std::vector<videoStream> videoStreams; std::vector<audioStream> audioStreams; int defaultAudioStream; std::vector<subtitleStream> subtitleStreams; - std::set<uint16_t> caids; + std::set<capid_pair> caids; int pcrPid; int pmtPid; int textPid; @@ -193,10 +199,10 @@ public: PyObject *createPythonObject(); }; - int getProgramInfo(struct program &program); + int getProgramInfo(program &program); int getDataDemux(ePtr<iDVBDemux> &demux); int getDecodeDemux(ePtr<iDVBDemux> &demux); - PyObject *getCaIds(); + PyObject *getCaIds(bool pair=false); // caid / ecmpid pair int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel); int getServiceReference(eServiceReferenceDVB &service) { service = m_reference; return 0; } |