predeclare eDVBCAService because it is used by the type definition of CAServiceMap,

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

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index bf83a70a8975cd1197a150bfa4d850d9c4c6e11d..362c64cc345256b426a0e4dff8795dee30617a33 100644 (file)
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -15,7 +15,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-class eDVBServicePMTHandler;
+class eDVBCAService;
 
 typedef std::map<eServiceReferenceDVB, eDVBCAService*> CAServiceMap;
 
@@ -61,13 +61,16 @@ class eDVBServicePMTHandler: public Object
        
        void channelStateChanged(iDVBChannel *);
        ePtr<eConnection> m_channelStateChanged_connection;
+       void channelEvent(iDVBChannel *, int event);
+       ePtr<eConnection> m_channelEvent_connection;
 
        void PMTready(int error);
        void PATready(int error);
        
-       int m_record;
+       int m_use_decode_demux;
+       
 public:
-       eDVBServicePMTHandler(int record);
+       eDVBServicePMTHandler();
        ~eDVBServicePMTHandler();
        
        enum
@@ -78,14 +81,17 @@ public:
                eventNoPATEntry,   // no pat entry for the corresponding SID could be found
                eventNoPMT,        // no pmt could be received (timeout)
                eventNewProgramInfo, // we just received a PMT
-               eventTuned         // a channel was sucessfully (re-)tuned in, you may start additional filters now
+               eventTuned,        // a channel was sucessfully (re-)tuned in, you may start additional filters now
+               
+               eventEOF,          // a file playback did end
        };
 
        Signal1<void,int> serviceEvent;
-       
+
        struct videoStream
        {
                int pid;
+               int component_tag;
        };
        
        struct audioStream
@@ -93,7 +99,9 @@ public:
                int pid;
                enum { atMPEG, atAC3, atDTS };
                int type; // mpeg2, ac3, dts, ...
-               // language code, ...
+               
+               int component_tag;
+               std::string language_code; /* iso-639, if available. */
        };
        
        struct program
@@ -103,13 +111,21 @@ public:
                // ca info
                int pcrPid;
                int pmtPid;
+               int textPid;
+               bool isCrypted;
        };
        
        int getProgramInfo(struct program &program);
-       int getDemux(ePtr<iDVBDemux> &demux);
-       int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
+       int getDataDemux(ePtr<iDVBDemux> &demux);
+       int getDecodeDemux(ePtr<iDVBDemux> &demux);
        
-       int tune(eServiceReferenceDVB &ref);    
+       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 use_decode_demux);
+       void free();
 };
 
 #endif