git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix DVB-T inversion
[enigma2.git]
/
lib
/
dvb
/
demux.h
diff --git
a/lib/dvb/demux.h
b/lib/dvb/demux.h
index d3a369f96607c5afc04087b8716a3c7e0de832d4..b14dfd263f09311ecf5d3b50f2e5728cbb13f4a4 100644
(file)
--- a/
lib/dvb/demux.h
+++ b/
lib/dvb/demux.h
@@
-19,11
+19,13
@@
public:
RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader);
RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder);
- RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader);
- RESULT getSTC(pts_t &pts);
+ RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader
, int primary
);
+ RESULT getSTC(pts_t &pts
, int num
);
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);
+
+ int getRefCount() { return ref; }
private:
int adapter, demux;
private:
int adapter, demux;
@@
-32,6
+34,7
@@
private:
friend class eDVBAudio;
friend class eDVBVideo;
friend class eDVBPCR;
friend class eDVBAudio;
friend class eDVBVideo;
friend class eDVBPCR;
+ friend class eDVBTText;
friend class eDVBTSRecorder;
friend class eDVBCAService;
Signal1<void, int> m_event;
friend class eDVBTSRecorder;
friend class eDVBCAService;
Signal1<void, int> m_event;
@@
-59,7
+62,7
@@
public:
RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
};
RESULT connectRead(const Slot1<void,const __u8*> &read, ePtr<eConnection> &conn);
};
-class e
FilePush
Thread;
+class e
DVBRecordFile
Thread;
class eDVBTSRecorder: public iDVBTSRecorder, public Object
{
class eDVBTSRecorder: public iDVBTSRecorder, public Object
{
@@
-72,9
+75,10
@@
public:
RESULT addPID(int pid);
RESULT removePID(int pid);
RESULT addPID(int pid);
RESULT removePID(int pid);
- RESULT set
Format
(int pid);
+ RESULT set
TimingPID
(int pid);
RESULT setTargetFD(int fd);
RESULT setTargetFD(int fd);
+ RESULT setTargetFilename(const char *filename);
RESULT setBoundary(off_t max);
RESULT stop();
RESULT setBoundary(off_t max);
RESULT stop();
@@
-84,14
+88,15
@@
private:
RESULT startPID(int pid);
void stopPID(int pid);
RESULT startPID(int pid);
void stopPID(int pid);
- e
FilePush
Thread *m_thread;
+ e
DVBRecordFile
Thread *m_thread;
std::map<int,int> m_pids;
Signal1<void,int> m_event;
ePtr<eDVBDemux> m_demux;
std::map<int,int> m_pids;
Signal1<void,int> m_event;
ePtr<eDVBDemux> m_demux;
- int m_running, m_format, m_target_fd, m_source_fd;
+ int m_running, m_target_fd, m_source_fd;
+ std::string m_target_filename;
};
#endif
};
#endif