#include <lib/dvb/demux.h>
#include <lib/dvb/frontend.h>
#include <lib/dvb/tstools.h>
+#include <lib/dvb/esection.h>
#include <connection.h>
+#include <dvbsi++/service_description_section.h>
+
class eDVBChannel;
/* we do NOT handle resource conflicts here. instead, the allocateChannel
class eDVBRegisteredFrontend: public iObject, public Object
{
DECLARE_REF(eDVBRegisteredFrontend);
- eTimer *disable;
- Signal0<void> stateChanged;
+ ePtr<eTimer> disable;
void closeFrontend()
{
if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
disable->start(60000, true); // retry close in 60secs
}
public:
+ Signal0<void> 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()
struct eDVBRegisteredDemux
{
-DECLARE_REF(eDVBRegisteredDemux);
+ DECLARE_REF(eDVBRegisteredDemux);
public:
iDVBAdapter *m_adapter;
ePtr<eDVBDemux> m_demux;
class eDVBAllocatedFrontend
{
-DECLARE_REF(eDVBAllocatedFrontend);
+ DECLARE_REF(eDVBAllocatedFrontend);
public:
eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe);
class eDVBAllocatedDemux
{
-DECLARE_REF(eDVBAllocatedDemux);
+ DECLARE_REF(eDVBAllocatedDemux);
public:
eDVBAllocatedDemux(eDVBRegisteredDemux *demux);
virtual RESULT getDemux(ePtr<eDVBDemux> &demux, int nr) = 0;
virtual int getNumFrontends() = 0;
- virtual RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr) = 0;
+ virtual RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr, bool simulate=false) = 0;
};
class eDVBAdapterLinux: public iDVBAdapter
{
-DECLARE_REF(eDVBAdapterLinux);
+ DECLARE_REF(eDVBAdapterLinux);
public:
eDVBAdapterLinux(int nr);
RESULT getDemux(ePtr<eDVBDemux> &demux, int nr);
int getNumFrontends();
- RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr);
+ RESULT getFrontend(ePtr<eDVBFrontend> &fe, int nr, bool simulate=false);
static int exist(int nr);
private:
int m_nr;
- eSmartPtrList<eDVBFrontend> m_frontend;
+ eSmartPtrList<eDVBFrontend> m_frontend, m_simulate_frontend;
eSmartPtrList<eDVBDemux> m_demux;
};
#endif // SWIG
DECLARE_REF(eDVBResourceManager);
int avail, busy;
+ enum { DM7025, DM800, DM500HD, DM8000 };
+
+ int m_boxtype;
+
eSmartPtrList<iDVBAdapter> m_adapter;
-
eSmartPtrList<eDVBRegisteredDemux> m_demux;
- eSmartPtrList<eDVBRegisteredFrontend> m_frontend;
-
+ eSmartPtrList<eDVBRegisteredFrontend> 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<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm);
- RESULT allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int slot_index);
-
- /* allocate a demux able to filter on the selected frontend. */
- RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
-
+
struct active_channel
{
eDVBChannelID m_channel_id;
active_channel(const eDVBChannelID &chid, eDVBChannel *ch) : m_channel_id(chid), m_channel(ch) { }
};
- std::list<active_channel> m_active_channels;
+ std::list<active_channel> m_active_channels, m_active_simulate_channels;
ePtr<iDVBChannelList> m_list;
ePtr<iDVBSatelliteEquipmentControl> m_sec;
Signal1<void,eDVBChannel*> m_channelAdded;
- int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
-
eUsePtr<iDVBChannel> m_cached_channel;
Connection m_cached_channel_state_changed_conn;
- eTimer m_releaseCachedChannelTimer;
+ ePtr<eTimer> m_releaseCachedChannelTimer;
void DVBChannelStateChanged(iDVBChannel*);
void feStateChanged();
#ifndef SWIG
RESULT getChannelList(ePtr<iDVBChannelList> &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<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
- int 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<iDVBChannel> &channel);
+ RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel, bool simulate=false);
RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
static RESULT getInstance(ePtr<eDVBResourceManager> &);
+
+ /* 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<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm, bool simulate=false);
+
+ RESULT allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int slot_index);
+ /* allocate a demux able to filter on the selected frontend. */
+ RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int &cap);
#ifdef SWIG
public:
#endif
+ int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, bool simulate=false);
+ bool canMeasureFrontendInputPower();
PSignal1<void,int> frontendUseMaskChanged;
SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int slot_index);
PyObject *setFrontendSlotInformations(SWIG_PYOBJECT(ePyObject) list);
RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode);
int getUseCount() { return m_use_count; }
+
+ RESULT requestTsidOnid(ePyObject callback);
private:
ePtr<eDVBAllocatedFrontend> m_frontend;
ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
void cueSheetEvent(int event);
ePtr<eConnection> 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<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);
oRefCount m_use_count;
void AddUse();
void ReleaseUse();
+
+ /* for tsid/onid read */
+ ePyObject m_tsid_onid_callback;
+ ePtr<iDVBDemux> m_tsid_onid_demux;
+ ePtr<eTable<ServiceDescriptionSection> > m_SDT;
+ void SDTready(int err);
};
#endif // SWIG
git.cweiske.de / enigma2.git / blobdiff