tables: don't retry more than 5*nr times.

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

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index bfef5b46d4b93679244632aa21c342fffb499bc7..76fb442f96013ff02fdbbf0bbf0f665b9580caf4 100644 (file)
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -37,8 +37,8 @@ class eDVBCAService: public Object
        eDVBCAService();
        ~eDVBCAService();
 public:
-       static RESULT register_demux( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice );
-       static RESULT unregister_demux( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr );
+       static RESULT register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice );
+       static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr );
        void buildCAPMT(eTable<ProgramMapSection> *ptr);
 };
 
@@ -82,10 +82,11 @@ public:
        };
 
        Signal1<void,int> serviceEvent;
-       
+
        struct videoStream
        {
                int pid;
+               int component_tag;
        };
        
        struct audioStream
@@ -93,7 +94,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 +106,17 @@ public:
                // ca info
                int pcrPid;
                int pmtPid;
+               bool isCrypted;
        };
        
        int getProgramInfo(struct program &program);
        int getDemux(ePtr<iDVBDemux> &demux);
        int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
-       
-       int tune(eServiceReferenceDVB &ref);    
+       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);
 };
 
 #endif