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/dvb/pmt.h | |
| parent | 36b4f5eccf81cc7a650d3bbfcc975d42b3d905c4 (diff) | |
| parent | 26e11cd67e0bbfebd41b860a008f240d3d1b3052 (diff) | |
| download | enigma2-0b019e9dd85ac88917984e90a9e27ae4cb496b0b.tar.gz enigma2-0b019e9dd85ac88917984e90a9e27ae4cb496b0b.zip | |
Merge branch 'bug_621_caid_info'
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 de0de052..5c8fa582 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::list<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; } |