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 some consts
[enigma2.git]
/
lib
/
dvb
/
dvb.h
diff --git
a/lib/dvb/dvb.h
b/lib/dvb/dvb.h
index d4c8eea0b4e410545047334cafdcd6e302d190c3..b739f0aeff9ce062765bc74d507440572116d672 100644
(file)
--- a/
lib/dvb/dvb.h
+++ b/
lib/dvb/dvb.h
@@
-117,7
+117,7
@@
class eDVBResourceManager: public iObject
RESULT allocateFrontend(const eDVBChannelID &chid, ePtr<eDVBAllocatedFrontend> &fe);
/* allocate a demux able to filter on the selected frontend. */
RESULT allocateFrontend(const eDVBChannelID &chid, ePtr<eDVBAllocatedFrontend> &fe);
/* allocate a demux able to filter on the selected frontend. */
- RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux);
+ RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux
, int cap
);
struct active_channel
{
struct active_channel
{
@@
-173,7
+173,7
@@
class eDVBChannel: public iDVBPVRChannel, public Object
{
DECLARE_REF(eDVBChannel);
public:
{
DECLARE_REF(eDVBChannel);
public:
- eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend
, eDVBAllocatedDemux *demux
);
+ eDVBChannel(eDVBResourceManager *mgr, eDVBAllocatedFrontend *frontend);
virtual ~eDVBChannel();
/* only for managed channels - effectively tunes to the channelid. should not be used... */
virtual ~eDVBChannel();
/* only for managed channels - effectively tunes to the channelid. should not be used... */
@@
-185,17
+185,21
@@
public:
RESULT getState(int &state);
RESULT setCIRouting(const eDVBCIRouting &routing);
RESULT getState(int &state);
RESULT setCIRouting(const eDVBCIRouting &routing);
- RESULT getDemux(ePtr<iDVBDemux> &demux);
+ RESULT getDemux(ePtr<iDVBDemux> &demux
, int cap
);
RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
/* iDVBPVRChannel */
RESULT playFile(const char *file);
RESULT getLength(pts_t &len);
RESULT getCurrentPosition(pts_t &pos);
RESULT getFrontend(ePtr<iDVBFrontend> &frontend);
/* iDVBPVRChannel */
RESULT playFile(const char *file);
RESULT getLength(pts_t &len);
RESULT getCurrentPosition(pts_t &pos);
+ RESULT seekTo(int relative, pts_t &pts);
+ /* seeking to relative positions won't work -
+ there is an unknown amount of buffers in between */
+ RESULT seekToPosition(const off_t &off);
private:
ePtr<eDVBAllocatedFrontend> m_frontend;
private:
ePtr<eDVBAllocatedFrontend> m_frontend;
- ePtr<eDVBAllocatedDemux> m_demux;
+ ePtr<eDVBAllocatedDemux> m_demux
, m_decoder_demux
;
ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
eDVBChannelID m_channel_id;
ePtr<iDVBFrontendParameters> m_current_frontend_parameters;
eDVBChannelID m_channel_id;