pmt: differentiate between data and decoder demux

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

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index b8ed76f9488dec38892a8e85a652c6996ac1c1a2..995cc9be5b9dc4c821ce93d5fcb42596d814cb40 100644 (file)
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -65,11 +65,9 @@ class eDVBServicePMTHandler: public Object
        void PMTready(int error);
        void PATready(int error);
        
        void PMTready(int error);
        void PATready(int error);
        

-       int m_record;
-       static int m_count;
+       int m_use_decode_demux;

 public:
 public:

-       static int getCount() { return m_count; }
-       eDVBServicePMTHandler(int record);
+       eDVBServicePMTHandler();

        ~eDVBServicePMTHandler();
        
        enum
        ~eDVBServicePMTHandler();
        
        enum


@@ -84,10 +82,11 @@ public:
        };
 
        Signal1<void,int> serviceEvent;
        };
 
        Signal1<void,int> serviceEvent;

-       
+

        struct videoStream
        {
                int pid;
        struct videoStream
        {
                int pid;

+               int component_tag;

        };
        
        struct audioStream
        };
        
        struct audioStream


@@ -107,16 +106,20 @@ public:
                // ca info
                int pcrPid;
                int pmtPid;
                // ca info
                int pcrPid;
                int pmtPid;

+               bool isCrypted;

        };
        
        int getProgramInfo(struct program &program);
        };
        
        int getProgramInfo(struct program &program);

-       int getDemux(ePtr<iDVBDemux> &demux);
+       int getDataDemux(ePtr<iDVBDemux> &demux);
+       int getDecodeDemux(ePtr<iDVBDemux> &demux);
+       

        int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
        int getService(eServiceReferenceDVB &service) { service = m_reference; return 0; }
        int getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
        int getChannel(eUsePtr<iDVBChannel> &channel);
 
        int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
        int getService(eServiceReferenceDVB &service) { service = m_reference; return 0; }
        int getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
        int getChannel(eUsePtr<iDVBChannel> &channel);
 

-       int tune(eServiceReferenceDVB &ref);
+       int tune(eServiceReferenceDVB &ref, int use_decode_demux);
+       void free();

 };
 
 #endif
 };
 
 #endif