remove unneeded workaround
[vuplus_dvbapp] / lib / dvb / dvb.h
index 5c3c515..692ae83 100644 (file)
@@ -1,6 +1,11 @@
 #ifndef __dvb_dvb_h
 #define __dvb_dvb_h
 
+#ifndef SWIG
+
+#include <lib/base/ebase.h>
+#include <lib/base/filepush.h>
+#include <lib/base/elock.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/demux.h>
 #include <lib/dvb/frontend.h>
@@ -14,14 +19,42 @@ class eDVBChannel;
           (and how to deallocate it). */
 class iDVBAdapter;
 
-class eDVBRegisteredFrontend: public iObject
+class eDVBRegisteredFrontend: public iObject, public Object
 {
-DECLARE_REF(eDVBRegisteredFrontend);
+       DECLARE_REF(eDVBRegisteredFrontend);
+       eTimer *disable;
+       Signal0<void> stateChanged;
+       void closeFrontend()
+       {
+               if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
+                       disable->start(60000, true);  // retry close in 60secs
+       }
 public:
+       eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap)
+               :disable(new eTimer(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0)
+       {
+               disable = new eTimer(eApp);
+               CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
+       }
+       void dec_use()
+       {
+               if (!--m_inuse)
+               {
+                       /* emit */ stateChanged();
+                       disable->start(3000, true);
+               }
+       }
+       void inc_use()
+       {
+               if (++m_inuse == 1)
+               {
+                       m_frontend->openFrontend();
+                       /* emit */ stateChanged();
+               }
+       }
        iDVBAdapter *m_adapter;
        ePtr<eDVBFrontend> m_frontend;
        int m_inuse;
-       eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap): m_adapter(adap), m_frontend(fe), m_inuse(0) { }
 };
 
 struct eDVBRegisteredDemux
@@ -92,12 +125,14 @@ private:
        eSmartPtrList<eDVBFrontend> m_frontend;
        eSmartPtrList<eDVBDemux>    m_demux;
 };
+#endif // SWIG
 
-class eDVBResourceManager: public iObject
+SWIG_IGNORE(eDVBResourceManager);
+class eDVBResourceManager: public iObject, public Object
 {
        DECLARE_REF(eDVBResourceManager);
        int avail, busy;
-       
+
        eSmartPtrList<iDVBAdapter> m_adapter;
        
        eSmartPtrList<eDVBRegisteredDemux> m_demux;
@@ -137,18 +172,23 @@ class eDVBResourceManager: public iObject
        friend class eDVBChannel;
        RESULT addChannel(const eDVBChannelID &chid, eDVBChannel *ch);
        RESULT removeChannel(eDVBChannel *ch);
-       
+
        Signal1<void,eDVBChannel*> m_channelAdded;
-       Signal1<void,eDVBChannel*> m_channelRemoved;
-       Signal1<void,iDVBChannel*> m_channelRunning;
 
-       bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, int used_tuner_mask);
+       int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+
+       eUsePtr<iDVBChannel> m_cached_channel;
+       Connection m_cached_channel_state_changed_conn;
+       eTimer m_releaseCachedChannelTimer;
+       void DVBChannelStateChanged(iDVBChannel*);
+       void releaseCachedChannel();
+       void feStateChanged();
+#ifndef SWIG
 public:
+#endif
        eDVBResourceManager();
        virtual ~eDVBResourceManager();
-       
-       static RESULT getInstance(ePtr<eDVBResourceManager> &ptr) { if (instance) { ptr = instance; return 0; } return -1; }
-       
+
        RESULT setChannelList(iDVBChannelList *list);
        RESULT getChannelList(ePtr<iDVBChannelList> &list);
        
@@ -157,25 +197,35 @@ public:
                errNoDemux    = -2,
                errChidNotFound = -3
        };
+       
+       RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
+       int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
 
                /* allocate channel... */
        RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
-       RESULT allocateRawChannel(eUsePtr<iDVBChannel> &channel, int frontend_index);
        RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
-
-       RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
-       RESULT connectChannelRemoved(const Slot1<void,eDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
-       RESULT connectChannelRunning(const Slot1<void,iDVBChannel*> &channelRemoved, ePtr<eConnection> &connection);
-
-       bool canAllocateChannel(const eDVBChannelID &channelid);
+       static RESULT getInstance(ePtr<eDVBResourceManager> &);
+#ifdef SWIG
+public:
+#endif
+       PSignal1<void,int> frontendUseMaskChanged;
+       SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int frontend_index);
 };
+SWIG_TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManager);
+SWIG_EXTEND(ePtr<eDVBResourceManager>,
+       static ePtr<eDVBResourceManager> getInstance()
+       {
+               extern ePtr<eDVBResourceManager> NewResourceManagerPtr(void);
+               return NewResourceManagerPtr();
+       }
+);
 
-class eFilePushThread;
-
+#ifndef SWIG
        /* iDVBPVRChannel includes iDVBChannel. don't panic. */
-class eDVBChannel: public iDVBPVRChannel, public Object
+class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object
 {
        DECLARE_REF(eDVBChannel);
+       friend class eDVBResourceManager;
 public:
        eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend);
        virtual ~eDVBChannel();
@@ -186,21 +236,25 @@ public:
        eDVBChannelID getChannelID() { return m_channel_id; }
 
        RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
+       RESULT connectEvent(const Slot2<void,iDVBChannel*,int> &eventChange, ePtr<eConnection> &connection);
+       
        RESULT getState(int &state);
 
        RESULT setCIRouting(const eDVBCIRouting &routing);
        RESULT getDemux(ePtr<iDVBDemux> &demux, int cap);
        RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
-       
+       RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &param);
+
                /* iDVBPVRChannel */
        RESULT playFile(const char *file);
+       void stopFile();
+       
+       void setCueSheet(eCueSheet *cuesheet);
+       
        RESULT getLength(pts_t &len);
-       RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos);
-       RESULT seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts);
-                       /* seeking to relative positions won't work - 
-                          there is an unknown amount of buffers in between */
-       RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &off);
+       RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode);
 
+       int getUseCount() { return m_use_count; }
 private:
        ePtr<eDVBAllocatedFrontend> m_frontend;
        ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
@@ -208,6 +262,7 @@ private:
        ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
        eDVBChannelID m_channel_id;
        Signal1<void,iDVBChannel*> m_stateChanged;
+       Signal2<void,iDVBChannel*,int> m_event;
        int m_state;
 
                        /* for channel list */
@@ -218,8 +273,22 @@ private:
        
                /* for PVR playback */
        eFilePushThread *m_pvr_thread;
-       int m_pvr_fd_src, m_pvr_fd_dst;
+       void pvrEvent(int event);
+       
+       int m_pvr_fd_dst;
        eDVBTSTools m_tstools;
+       
+       ePtr<eCueSheet> m_cue;
+       
+       void cueSheetEvent(int event);
+       ePtr<eConnection> m_conn_cueSheetEvent;
+       int m_skipmode_m, m_skipmode_n;
+       
+       std::list<std::pair<off_t, off_t> > m_source_span;
+       void getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size);
+       void flushPVR(iDVBDemux *decoding_demux=0);
+       
+       eSingleLock m_cuesheet_lock;
 
        friend class eUsePtr<eDVBChannel>;
                /* use count */
@@ -227,5 +296,6 @@ private:
        void AddUse();
        void ReleaseUse();
 };
+#endif // SWIG
 
 #endif