X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4008892983b7a8348b24dccea5f6f98826adc2d6..6c64f5122744f89b948540faad3352fbacbc6c58:/lib/dvb/dvb.h diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h index 3ad3cc1b..7b320006 100644 --- a/lib/dvb/dvb.h +++ b/lib/dvb/dvb.h @@ -10,8 +10,11 @@ #include #include #include +#include #include +#include + class eDVBChannel; /* we do NOT handle resource conflicts here. instead, the allocateChannel @@ -22,28 +25,34 @@ class iDVBAdapter; class eDVBRegisteredFrontend: public iObject, public Object { DECLARE_REF(eDVBRegisteredFrontend); - eTimer *disable; + ePtr disable; void closeFrontend() { if (!m_inuse && m_frontend->closeFrontend()) // frontend busy disable->start(60000, true); // retry close in 60secs } public: + Signal0 stateChanged; eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap) - :disable(new eTimer(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0) + :disable(eTimer::create(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 m_frontend; @@ -52,7 +61,7 @@ public: struct eDVBRegisteredDemux { -DECLARE_REF(eDVBRegisteredDemux); + DECLARE_REF(eDVBRegisteredDemux); public: iDVBAdapter *m_adapter; ePtr m_demux; @@ -62,7 +71,7 @@ public: class eDVBAllocatedFrontend { -DECLARE_REF(eDVBAllocatedFrontend); + DECLARE_REF(eDVBAllocatedFrontend); public: eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe); @@ -77,7 +86,7 @@ private: class eDVBAllocatedDemux { -DECLARE_REF(eDVBAllocatedDemux); + DECLARE_REF(eDVBAllocatedDemux); public: eDVBAllocatedDemux(eDVBRegisteredDemux *demux); @@ -97,12 +106,12 @@ public: virtual RESULT getDemux(ePtr &demux, int nr) = 0; virtual int getNumFrontends() = 0; - virtual RESULT getFrontend(ePtr &fe, int nr) = 0; + virtual RESULT getFrontend(ePtr &fe, int nr, bool simulate=false) = 0; }; class eDVBAdapterLinux: public iDVBAdapter { -DECLARE_REF(eDVBAdapterLinux); + DECLARE_REF(eDVBAdapterLinux); public: eDVBAdapterLinux(int nr); @@ -110,43 +119,31 @@ public: RESULT getDemux(ePtr &demux, int nr); int getNumFrontends(); - RESULT getFrontend(ePtr &fe, int nr); + RESULT getFrontend(ePtr &fe, int nr, bool simulate=false); static int exist(int nr); private: int m_nr; - eSmartPtrList m_frontend; + eSmartPtrList m_frontend, m_simulate_frontend; eSmartPtrList m_demux; }; - #endif // SWIG +SWIG_IGNORE(eDVBResourceManager); class eDVBResourceManager: public iObject, public Object { DECLARE_REF(eDVBResourceManager); int avail, busy; + enum { DM7025, DM800, DM500HD, DM8000 }; + + int m_boxtype; + eSmartPtrList m_adapter; - eSmartPtrList m_demux; - eSmartPtrList m_frontend; - + eSmartPtrList m_frontend, m_simulate_frontend; void addAdapter(iDVBAdapter *adapter); - - /* allocates a frontend able to tune to frontend paramters 'feperm'. - the frontend must be tuned lateron. there is no guarante - that tuning will succeed - it just means that if this frontend - can't tune, no other frontend could do it. - - there might be a priority given to certain frontend/chid - combinations. this will be evaluated here. */ - - RESULT allocateFrontend(ePtr &fe, ePtr &feparm); - RESULT allocateFrontendByIndex(ePtr &fe, int index); - - /* allocate a demux able to filter on the selected frontend. */ - RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr &demux, int cap); - + struct active_channel { eDVBChannelID m_channel_id; @@ -156,7 +153,7 @@ class eDVBResourceManager: public iObject, public Object active_channel(const eDVBChannelID &chid, eDVBChannel *ch) : m_channel_id(chid), m_channel(ch) { } }; - std::list m_active_channels; + std::list m_active_channels, m_active_simulate_channels; ePtr m_list; ePtr m_sec; @@ -168,16 +165,15 @@ class eDVBResourceManager: public iObject, public Object Signal1 m_channelAdded; - bool canAllocateFrontend(ePtr &feparm); - eUsePtr m_cached_channel; Connection m_cached_channel_state_changed_conn; - eTimer m_releaseCachedChannelTimer; + ePtr m_releaseCachedChannelTimer; void DVBChannelStateChanged(iDVBChannel*); - void releaseCachedChannel(); + void feStateChanged(); #ifndef SWIG public: #endif + void releaseCachedChannel(); eDVBResourceManager(); virtual ~eDVBResourceManager(); @@ -185,26 +181,57 @@ public: RESULT getChannelList(ePtr &list); enum { - errNoFrontend = -1, + /* errNoFrontend = -1 replaced by more spcific messages */ errNoDemux = -2, - errChidNotFound = -3 + errChidNotFound = -3, + errNoChannelList = -4, + errChannelNotInList = -5, + errAllSourcesBusy = -6, + errNoSourceFound = -7, }; - + RESULT connectChannelAdded(const Slot1 &channelAdded, ePtr &connection); - bool canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore); + int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore, bool simulate=false); /* allocate channel... */ - RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr &channel); + RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr &channel, bool simulate=false); RESULT allocatePVRChannel(eUsePtr &channel); + static RESULT getInstance(ePtr &); + + /* allocates a frontend able to tune to frontend paramters 'feperm'. + the frontend must be tuned lateron. there is no guarante + that tuning will succeed - it just means that if this frontend + can't tune, no other frontend could do it. + + there might be a priority given to certain frontend/chid + combinations. this will be evaluated here. */ + RESULT allocateFrontend(ePtr &fe, ePtr &feparm, bool simulate=false); + + RESULT allocateFrontendByIndex(ePtr &fe, int slot_index); + /* allocate a demux able to filter on the selected frontend. */ + RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr &demux, int &cap); #ifdef SWIG public: #endif - RESULT allocateRawChannel(eUsePtr &SWIG_OUTPUT, int frontend_index); - static RESULT getInstance(ePtr &SWIG_OUTPUT); + int canAllocateFrontend(ePtr &feparm, bool simulate=false); + bool canMeasureFrontendInputPower(); + PSignal1 frontendUseMaskChanged; + SWIG_VOID(RESULT) allocateRawChannel(eUsePtr &SWIG_OUTPUT, int slot_index); + PyObject *setFrontendSlotInformations(SWIG_PYOBJECT(ePyObject) list); }; -TEMPLATE_TYPEDEF(ePtr, eDVBResourceManagerPtr); +SWIG_TEMPLATE_TYPEDEF(ePtr, eDVBResourceManager); +SWIG_EXTEND(ePtr, + static ePtr getInstance() + { + extern ePtr NewResourceManagerPtr(void); + return NewResourceManagerPtr(); + } +); + #ifndef SWIG +class eDVBChannelFilePush; + /* iDVBPVRChannel includes iDVBChannel. don't panic. */ class eDVBChannel: public iDVBPVRChannel, public iFilePushScatterGather, public Object { @@ -239,6 +266,8 @@ public: RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode); int getUseCount() { return m_use_count; } + + RESULT requestTsidOnid(ePyObject callback); private: ePtr m_frontend; ePtr m_demux, m_decoder_demux; @@ -256,7 +285,7 @@ private: ePtr m_conn_frontendStateChanged; /* for PVR playback */ - eFilePushThread *m_pvr_thread; + eDVBChannelFilePush *m_pvr_thread; void pvrEvent(int event); int m_pvr_fd_dst; @@ -266,7 +295,7 @@ private: void cueSheetEvent(int event); ePtr m_conn_cueSheetEvent; - int m_skipmode_m, m_skipmode_n; + int m_skipmode_m, m_skipmode_n, m_skipmode_frames, m_skipmode_frames_remainder; std::list > m_source_span; void getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size); @@ -279,7 +308,13 @@ private: oRefCount m_use_count; void AddUse(); void ReleaseUse(); -}; + /* for tsid/onid read */ + ePyObject m_tsid_onid_callback; + ePtr m_tsid_onid_demux; + ePtr > m_SDT; + void SDTready(int err); +}; #endif // SWIG + #endif