git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/translations' into experimental
[enigma2.git]
/
lib
/
dvb
/
dvb.h
diff --git
a/lib/dvb/dvb.h
b/lib/dvb/dvb.h
index 04543ae22b74b689684e2aa7a9dd59296433a1fb..7b3200066d2b9f4508adf932b34f1d2f382c2e9f 100644
(file)
--- a/
lib/dvb/dvb.h
+++ b/
lib/dvb/dvb.h
@@
-10,8
+10,11
@@
#include <lib/dvb/demux.h>
#include <lib/dvb/frontend.h>
#include <lib/dvb/tstools.h>
#include <lib/dvb/demux.h>
#include <lib/dvb/frontend.h>
#include <lib/dvb/tstools.h>
+#include <lib/dvb/esection.h>
#include <connection.h>
#include <connection.h>
+#include <dvbsi++/service_description_section.h>
+
class eDVBChannel;
/* we do NOT handle resource conflicts here. instead, the allocateChannel
class eDVBChannel;
/* we do NOT handle resource conflicts here. instead, the allocateChannel
@@
-22,7
+25,7
@@
class iDVBAdapter;
class eDVBRegisteredFrontend: public iObject, public Object
{
DECLARE_REF(eDVBRegisteredFrontend);
class eDVBRegisteredFrontend: public iObject, public Object
{
DECLARE_REF(eDVBRegisteredFrontend);
- e
Timer *
disable;
+ e
Ptr<eTimer>
disable;
void closeFrontend()
{
if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
void closeFrontend()
{
if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
@@
-31,14
+34,10
@@
class eDVBRegisteredFrontend: public iObject, public Object
public:
Signal0<void> stateChanged;
eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap)
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)
{
CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
}
{
CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
}
- ~eDVBRegisteredFrontend()
- {
- delete disable;
- }
void dec_use()
{
if (!--m_inuse)
void dec_use()
{
if (!--m_inuse)
@@
-107,7
+106,7
@@
public:
virtual RESULT getDemux(ePtr<eDVBDemux> &demux, int nr) = 0;
virtual int getNumFrontends() = 0;
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
};
class eDVBAdapterLinux: public iDVBAdapter
@@
-120,12
+119,12
@@
public:
RESULT getDemux(ePtr<eDVBDemux> &demux, int nr);
int getNumFrontends();
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;
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
eSmartPtrList<eDVBDemux> m_demux;
};
#endif // SWIG
@@
-136,9
+135,13
@@
class eDVBResourceManager: public iObject, public Object
DECLARE_REF(eDVBResourceManager);
int avail, busy;
DECLARE_REF(eDVBResourceManager);
int avail, busy;
+ enum { DM7025, DM800, DM500HD, DM8000 };
+
+ int m_boxtype;
+
eSmartPtrList<iDVBAdapter> m_adapter;
eSmartPtrList<eDVBRegisteredDemux> m_demux;
eSmartPtrList<iDVBAdapter> m_adapter;
eSmartPtrList<eDVBRegisteredDemux> m_demux;
- eSmartPtrList<eDVBRegisteredFrontend> m_frontend;
+ eSmartPtrList<eDVBRegisteredFrontend> m_frontend
, m_simulate_frontend
;
void addAdapter(iDVBAdapter *adapter);
struct active_channel
void addAdapter(iDVBAdapter *adapter);
struct active_channel
@@
-150,7
+153,7
@@
class eDVBResourceManager: public iObject, public Object
active_channel(const eDVBChannelID &chid, eDVBChannel *ch) : m_channel_id(chid), m_channel(ch) { }
};
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;
ePtr<iDVBChannelList> m_list;
ePtr<iDVBSatelliteEquipmentControl> m_sec;
@@
-164,7
+167,7
@@
class eDVBResourceManager: public iObject, public Object
eUsePtr<iDVBChannel> m_cached_channel;
Connection m_cached_channel_state_changed_conn;
eUsePtr<iDVBChannel> m_cached_channel;
Connection m_cached_channel_state_changed_conn;
- e
Timer
m_releaseCachedChannelTimer;
+ e
Ptr<eTimer>
m_releaseCachedChannelTimer;
void DVBChannelStateChanged(iDVBChannel*);
void feStateChanged();
#ifndef SWIG
void DVBChannelStateChanged(iDVBChannel*);
void feStateChanged();
#ifndef SWIG
@@
-188,10
+191,10
@@
public:
};
RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
};
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... */
/* 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> &);
RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
static RESULT getInstance(ePtr<eDVBResourceManager> &);
@@
-202,15
+205,15
@@
public:
there might be a priority given to certain frontend/chid
combinations. this will be evaluated here. */
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 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 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);
+ RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int
&
cap);
#ifdef SWIG
public:
#endif
#ifdef SWIG
public:
#endif
- int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+ 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);
bool canMeasureFrontendInputPower();
PSignal1<void,int> frontendUseMaskChanged;
SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int slot_index);
@@
-263,6
+266,8
@@
public:
RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode);
int getUseCount() { return m_use_count; }
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;
private:
ePtr<eDVBAllocatedFrontend> m_frontend;
ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
@@
-290,7
+295,7
@@
private:
void cueSheetEvent(int event);
ePtr<eConnection> m_conn_cueSheetEvent;
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);
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);
@@
-303,6
+308,12
@@
private:
oRefCount m_use_count;
void AddUse();
void ReleaseUse();
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
};
#endif // SWIG