install SubtitleDisplay.py

[enigma2.git] / lib / dvb / pmt.h

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index 6a5b00db195ef10a24da0df76cd2906f31c3d3be..57176d1f363d189365c445f47faf74d0b56efddf 100644 (file)
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -99,12 +99,14 @@ public:
        {
                int pid;
                int component_tag;
+               enum { vtMPEG2, vtMPEG4_H264 };
+               int type;
        };
        
        struct audioStream
        {
                int pid;
-               enum { atMPEG, atAC3, atDTS };
+               enum { atMPEG, atAC3, atDTS, atAAC };
                int type; // mpeg2, ac3, dts, ...
                
                int component_tag;
@@ -115,11 +117,12 @@ public:
        {
                std::vector<videoStream> videoStreams;
                std::vector<audioStream> audioStreams;
-               // ca info
+               std::set<uint16_t> caids;
                int pcrPid;
                int pmtPid;
                int textPid;
-               bool isCrypted;
+               bool isCrypted() { return !caids.empty(); }
+               int audioChannel;
        };
        
        int getProgramInfo(struct program &program);
@@ -128,7 +131,8 @@ public:
        PyObject *getCaIds();
        
        int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
-       int getService(eServiceReferenceDVB &service) { service = m_reference; return 0; }
+       int getServiceReference(eServiceReferenceDVB &service) { service = m_reference; return 0; }
+       int getService(ePtr<eDVBService> &service) { service = m_service; return 0; }
        int getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
        int getChannel(eUsePtr<iDVBChannel> &channel);