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/bug_448_fix_wlanscan' into experimental
[enigma2.git]
/
lib
/
dvb
/
demux.h
diff --git
a/lib/dvb/demux.h
b/lib/dvb/demux.h
index 1c0da47c6f6b27f188b5a5f615f3a66b9a623740..7a697d49db27b5473db29b4d07b77bf800a5202f 100644
(file)
--- a/
lib/dvb/demux.h
+++ b/
lib/dvb/demux.h
@@
-54,7
+54,7
@@
class eDVBSectionReader: public iDVBSectionReader, public Object
int active;
int checkcrc;
void data(int);
int active;
int checkcrc;
void data(int);
- e
SocketNotifier *
notifier;
+ e
Ptr<eSocketNotifier>
notifier;
public:
eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
public:
eDVBSectionReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
@@
-72,7
+72,7
@@
class eDVBPESReader: public iDVBPESReader, public Object
ePtr<eDVBDemux> m_demux;
int m_active;
void data(int);
ePtr<eDVBDemux> m_demux;
int m_active;
void data(int);
- e
SocketNotifier *
m_notifier;
+ e
Ptr<eSocketNotifier>
m_notifier;
public:
eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
virtual ~eDVBPESReader();
public:
eDVBPESReader(eDVBDemux *demux, eMainloop *context, RESULT &res);
virtual ~eDVBPESReader();
@@
-94,14
+94,16
@@
public:
RESULT addPID(int pid);
RESULT removePID(int pid);
RESULT addPID(int pid);
RESULT removePID(int pid);
- RESULT setTimingPID(int pid);
+ RESULT setTimingPID(int pid
, int type
);
RESULT setTargetFD(int fd);
RESULT setTargetFilename(const char *filename);
RESULT setBoundary(off_t max);
RESULT stop();
RESULT setTargetFD(int fd);
RESULT setTargetFilename(const char *filename);
RESULT setBoundary(off_t max);
RESULT stop();
-
+
+ RESULT getCurrentPCR(pts_t &pcr);
+
RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
private:
RESULT startPID(int pid);
RESULT connectEvent(const Slot1<void,int> &event, ePtr<eConnection> &conn);
private:
RESULT startPID(int pid);