git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add channel cache (transponders)
[enigma2.git]
/
lib
/
dvb
/
dvb.h
diff --git
a/lib/dvb/dvb.h
b/lib/dvb/dvb.h
index b739f0aeff9ce062765bc74d507440572116d672..ac5946cd6d9dcd0a91eeedd4d94957e4a7fa44ec 100644
(file)
--- a/
lib/dvb/dvb.h
+++ b/
lib/dvb/dvb.h
@@
-7,7
+7,6
@@
#include <lib/dvb/tstools.h>
#include <connection.h>
#include <lib/dvb/tstools.h>
#include <connection.h>
-class eDVBChannel;
class eDVBChannel;
/* we do NOT handle resource conflicts here. instead, the allocateChannel
class eDVBChannel;
/* we do NOT handle resource conflicts here. instead, the allocateChannel
@@
-98,7
+97,9
@@
class eDVBResourceManager: public iObject
{
DECLARE_REF(eDVBResourceManager);
int avail, busy;
{
DECLARE_REF(eDVBResourceManager);
int avail, busy;
-
+
+ eUsePtr<iDVBChannel> m_cached_channel;
+
eSmartPtrList<iDVBAdapter> m_adapter;
eSmartPtrList<eDVBRegisteredDemux> m_demux;
eSmartPtrList<iDVBAdapter> m_adapter;
eSmartPtrList<eDVBRegisteredDemux> m_demux;
@@
-106,15
+107,16
@@
class eDVBResourceManager: public iObject
void addAdapter(iDVBAdapter *adapter);
void addAdapter(iDVBAdapter *adapter);
- /* allocates a frontend able to tune to
channelID "chid"
.
+ /* allocates a frontend able to tune to
frontend paramters 'feperm'
.
the frontend must be tuned lateron. there is no guarante
the frontend must be tuned lateron. there is no guarante
- that tuning will suceed - it just means that if this frontend
+ that tuning will suc
c
eed - 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. */
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(const eDVBChannelID &chid, ePtr<eDVBAllocatedFrontend> &fe);
+ RESULT allocateFrontend(ePtr<eDVBAllocatedFrontend> &fe, ePtr<iDVBFrontendParameters> &feparm);
+ RESULT allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int index);
/* allocate a demux able to filter on the selected frontend. */
RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
/* allocate a demux able to filter on the selected frontend. */
RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
@@
-137,10
+139,10
@@
class eDVBResourceManager: public iObject
friend class eDVBChannel;
RESULT addChannel(const eDVBChannelID &chid, eDVBChannel *ch);
RESULT removeChannel(eDVBChannel *ch);
friend class eDVBChannel;
RESULT addChannel(const eDVBChannelID &chid, eDVBChannel *ch);
RESULT removeChannel(eDVBChannel *ch);
-
+
Signal1<void,eDVBChannel*> m_channelAdded;
Signal1<void,eDVBChannel*> m_channelAdded;
- Signal1<void,eDVBChannel*> m_channelRemoved;
-
Signal1<void,iDVBChannel*> m_channelRunning
;
+
+
bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
;
public:
eDVBResourceManager();
virtual ~eDVBResourceManager();
public:
eDVBResourceManager();
virtual ~eDVBResourceManager();
@@
-155,15
+157,15
@@
public:
errNoDemux = -2,
errChidNotFound = -3
};
errNoDemux = -2,
errChidNotFound = -3
};
-
+
/* allocate channel... */
RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
/* allocate channel... */
RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel);
- RESULT allocateRawChannel(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 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, const eDVBChannelID &ignore
);
};
class eFilePushThread;
};
class eFilePushThread;
@@
-178,7
+180,7
@@
public:
/* only for managed channels - effectively tunes to the channelid. should not be used... */
/* cannot be used for PVR channels. */
/* only for managed channels - effectively tunes to the channelid. should not be used... */
/* cannot be used for PVR channels. */
- RESULT setChannel(const eDVBChannelID &id);
+ RESULT setChannel(const eDVBChannelID &id
, ePtr<iDVBFrontendParameters> &feparam
);
eDVBChannelID getChannelID() { return m_channel_id; }
RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
eDVBChannelID getChannelID() { return m_channel_id; }
RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection);
@@
-191,12
+193,13
@@
public:
/* iDVBPVRChannel */
RESULT playFile(const char *file);
RESULT getLength(pts_t &len);
/* iDVBPVRChannel */
RESULT playFile(const char *file);
RESULT getLength(pts_t &len);
- RESULT getCurrentPosition(pts_t &pos);
- RESULT seekTo(int relative, pts_t &pts);
+ RESULT getCurrentPosition(
iDVBDemux *decoding_demux,
pts_t &pos);
+ RESULT seekTo(i
DVBDemux *decoding_demux, i
nt relative, pts_t &pts);
/* seeking to relative positions won't work -
there is an unknown amount of buffers in between */
/* seeking to relative positions won't work -
there is an unknown amount of buffers in between */
- RESULT seekToPosition(const off_t &off);
+ RESULT seekToPosition(
iDVBDemux *decoding_demux,
const off_t &off);
+ int getUseCount() { return m_use_count; }
private:
ePtr<eDVBAllocatedFrontend> m_frontend;
ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
private:
ePtr<eDVBAllocatedFrontend> m_frontend;
ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;