create global (real) config entries, update setup on hotplug (untested), fix apply...

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

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index 95d3cc43522c36fa506ce1cf8de2ff218f27d099..9e7c52740e390b8c38040f577a1f723af2e28592 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>
@@ -19,7 +20,18 @@
 class eDVBCAService;
 class eDVBScan;
 
+struct channel_data: public Object
+{
+       ePtr<eDVBChannel> m_channel;
+       ePtr<eConnection> m_stateChangedConn;
+       int m_prevChannelState;
+       int m_dataDemux;
+};
+
+// TODO .. put all static stuff into a 'eDVBCAServiceHandler class'
+
 typedef std::map<eServiceReferenceDVB, eDVBCAService*> CAServiceMap;
+typedef std::map<iDVBChannel*, channel_data*> ChannelMap;
 
 class eDVBCAService: public Object
 {
@@ -35,17 +47,27 @@ class eDVBCAService: public Object
        void sendCAPMT();
        void Connect();
 
+       static void DVBChannelAdded(eDVBChannel*);
+       static void DVBChannelStateChanged(iDVBChannel*);
        static CAServiceMap exist;
+       static ChannelMap exist_channels;
+       static ePtr<eConnection> m_chanAddedConn;
+       static channel_data *getChannelData(eDVBChannelID &chid);
+
        eDVBCAService();
        ~eDVBCAService();
 public:
+       static void registerChannelCallback(eDVBResourceManager *res_mgr);
        static RESULT register_service( const eServiceReferenceDVB &ref, int demux_nums[2], eDVBCAService *&caservice );
        static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_nums[2], eTable<ProgramMapSection> *ptr );
        void buildCAPMT(eTable<ProgramMapSection> *ptr);
 };
 
+#endif
+
 class eDVBServicePMTHandler: public Object
 {
+#ifndef SWIG
        friend class eDVBCAService;
        eServiceReferenceDVB m_reference;
        ePtr<eDVBService> m_service;
@@ -79,7 +101,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 +122,7 @@ public:
                eventSOF,          // seek pre start
                eventEOF,          // a file playback did end
        };
-
+#ifndef SWIG
        Signal1<void,int> serviceEvent;
 
        struct videoStream
@@ -146,12 +175,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 +203,7 @@ public:
 private:
        bool m_have_cached_program;
        program m_cached_program;
+#endif
 };
 
 #endif