ASSERT m_pvr_thread to be alive

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

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index 95d3cc43522c36fa506ce1cf8de2ff218f27d099..d1e28703ef26654b85f87a3065efa792c093509e 100644 (file)
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -1,6 +1,7 @@
 #ifndef __lib_dvb_dvbmid_h
 #define __lib_dvb_dvbmid_h
 
+#ifndef SWIG
 #include <map>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
@@ -44,8 +45,11 @@ public:
        void buildCAPMT(eTable<ProgramMapSection> *ptr);
 };
 
+#endif
+
 class eDVBServicePMTHandler: public Object
 {
+#ifndef SWIG
        friend class eDVBCAService;
        eServiceReferenceDVB m_reference;
        ePtr<eDVBService> m_service;
@@ -79,7 +83,14 @@ class eDVBServicePMTHandler: public Object
 public:
        eDVBServicePMTHandler();
        ~eDVBServicePMTHandler();
-       
+#endif
+
+#ifdef SWIG
+private:
+       eDVBServicePMTHandler();
+public:
+#endif
+
        enum
        {
                eventNoResources,  // a requested resource couldn't be allocated
@@ -93,7 +104,7 @@ public:
                eventSOF,          // seek pre start
                eventEOF,          // a file playback did end
        };
-
+#ifndef SWIG
        Signal1<void,int> serviceEvent;
 
        struct videoStream
@@ -146,12 +157,15 @@ public:
        {
                std::vector<videoStream> videoStreams;
                std::vector<audioStream> audioStreams;
+               int defaultAudioStream;
                std::vector<subtitleStream> subtitleStreams;
                std::set<uint16_t> caids;
                int pcrPid;
                int pmtPid;
                int textPid;
                bool isCrypted() { return !caids.empty(); }
+               
+               PyObject *createPythonObject();
        };
 
        int getProgramInfo(struct program &program);
@@ -171,6 +185,7 @@ public:
 private:
        bool m_have_cached_program;
        program m_cached_program;
+#endif
 };
 
 #endif