git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove workaround
[enigma2.git]
/
lib
/
dvb
/
demux.h
diff --git
a/lib/dvb/demux.h
b/lib/dvb/demux.h
index 08d9f43de19d1cfad798a894b20e80f9a8dddb27..d3a369f96607c5afc04087b8716a3c7e0de832d4 100644
(file)
--- a/
lib/dvb/demux.h
+++ b/
lib/dvb/demux.h
@@
-6,23
+6,17
@@
class eDVBDemux: public iDVBDemux
{
class eDVBDemux: public iDVBDemux
{
- int adapter, demux;
-
- int m_dvr_busy;
- friend class eDVBSectionReader;
- friend class eDVBAudio;
- friend class eDVBVideo;
- friend class eDVBPCR;
- friend class eDVBTSRecorder;
- friend class eDVBCAService;
- Signal1<void, int> m_event;
+ DECLARE_REF(eDVBDemux);
public:
enum {
evtFlush
};
public:
enum {
evtFlush
};
- DECLARE_REF(eDVBDemux);
eDVBDemux(int adapter, int demux);
virtual ~eDVBDemux();
eDVBDemux(int adapter, int demux);
virtual ~eDVBDemux();
+
+ RESULT setSourceFrontend(int fenum);
+ RESULT setSourcePVR(int pvrnum);
+
RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
@@
-30,6
+24,19
@@
public:
RESULT getCADemuxID(uint8_t &id) { id = demux; return 0; }
RESULT flush();
RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
RESULT getCADemuxID(uint8_t &id) { id = demux; return 0; }
RESULT flush();
RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
+private:
+ int adapter, demux;
+
+ int m_dvr_busy;
+ friend class eDVBSectionReader;
+ friend class eDVBAudio;
+ friend class eDVBVideo;
+ friend class eDVBPCR;
+ friend class eDVBTSRecorder;
+ friend class eDVBCAService;
+ Signal1<void, int> m_event;
+
+ int openDemux(void);
};
class eDVBSectionReader: public iDVBSectionReader, public Object
};
class eDVBSectionReader: public iDVBSectionReader, public Object