git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small fix
[enigma2.git]
/
lib
/
dvb
/
dvb.h
diff --git
a/lib/dvb/dvb.h
b/lib/dvb/dvb.h
index 5c3c515035819d37a535b6bf158810ade742ba9d..ee8ea8ef5afe3df05c53a7db0e63f4bee0a6e13e 100644
(file)
--- a/
lib/dvb/dvb.h
+++ b/
lib/dvb/dvb.h
@@
-137,12
+137,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
, int used_tuner_mask
);
+ bool canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
public:
eDVBResourceManager();
virtual ~eDVBResourceManager();
public:
eDVBResourceManager();
virtual ~eDVBResourceManager();
@@
-164,10
+162,8
@@
public:
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);
+ bool canAllocateChannel(const eDVBChannelID &channelid
, const eDVBChannelID &ignore
);
};
class eFilePushThread;
};
class eFilePushThread;
@@
-201,6
+197,7
@@
public:
there is an unknown amount of buffers in between */
RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &off);
there is an unknown amount of buffers in between */
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;