small extensions

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

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index b7115ae2080ff84f5b46ff2d201cd2f765680cb5..57176d1f363d189365c445f47faf74d0b56efddf 100644 (file)
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -6,6 +6,7 @@
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/idemux.h>
 #include <lib/dvb/esection.h>
+#include <lib/python/python.h>
 #include <dvbsi++/program_map_section.h>
 #include <dvbsi++/program_association_section.h>
 
@@ -16,6 +17,7 @@
 #include <fcntl.h>
 
 class eDVBCAService;
+class eDVBScan;
 
 typedef std::map<eServiceReferenceDVB, eDVBCAService*> CAServiceMap;
 
@@ -50,6 +52,7 @@ class eDVBServicePMTHandler: public Object
 
        int m_last_channel_state;
        eDVBCAService *m_ca_servicePtr;
+       eDVBScan *m_dvb_scan; // for sdt scan
 
        eAUTable<eTable<ProgramMapSection> > m_PMT;
        eAUTable<eTable<ProgramAssociationSection> > m_PAT;
@@ -63,13 +66,15 @@ class eDVBServicePMTHandler: public Object
        ePtr<eConnection> m_channelStateChanged_connection;
        void channelEvent(iDVBChannel *, int event);
        ePtr<eConnection> m_channelEvent_connection;
+       void SDTScanEvent(int);
+       ePtr<eConnection> m_scan_event_connection;
 
        void PMTready(int error);
        void PATready(int error);
        
        int m_use_decode_demux;
        uint8_t m_decode_demux_num;
-       
+
 public:
        eDVBServicePMTHandler();
        ~eDVBServicePMTHandler();
@@ -94,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;
@@ -110,24 +117,29 @@ 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);
        int getDataDemux(ePtr<iDVBDemux> &demux);
        int getDecodeDemux(ePtr<iDVBDemux> &demux);
+       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);
 
        int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0);
        void free();
+
+       int m_pmt_pid;
 };
 
 #endif