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 tuner selection in positioner plugin for more than one dvb-s nim
[enigma2.git]
/
lib
/
dvb
/
pmt.h
diff --git
a/lib/dvb/pmt.h
b/lib/dvb/pmt.h
index b8ed76f9488dec38892a8e85a652c6996ac1c1a2..79d7917c251b684c02a0739b473dcee29c974957 100644
(file)
--- a/
lib/dvb/pmt.h
+++ b/
lib/dvb/pmt.h
@@
-15,14
+15,14
@@
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
-class eDVB
ServicePMTHandler
;
+class eDVB
CAService
;
typedef std::map<eServiceReferenceDVB, eDVBCAService*> CAServiceMap;
class eDVBCAService: public Object
{
eServiceReferenceDVB m_service;
typedef std::map<eServiceReferenceDVB, eDVBCAService*> CAServiceMap;
class eDVBCAService: public Object
{
eServiceReferenceDVB m_service;
- uint8_t m_used_demux[
10
];
+ uint8_t m_used_demux[
32
];
unsigned int m_prev_build_hash;
int m_sock, m_clilen;
unsigned int m_prev_build_hash;
int m_sock, m_clilen;
@@
-37,8
+37,8
@@
class eDVBCAService: public Object
eDVBCAService();
~eDVBCAService();
public:
eDVBCAService();
~eDVBCAService();
public:
- static RESULT register_service( const eServiceReferenceDVB &ref, int demux_num, eDVBCAService *&caservice );
- static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_num, eTable<ProgramMapSection> *ptr );
+ static RESULT register_service( const eServiceReferenceDVB &ref, int demux_num
s[2]
, eDVBCAService *&caservice );
+ static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_num
s[2]
, eTable<ProgramMapSection> *ptr );
void buildCAPMT(eTable<ProgramMapSection> *ptr);
};
void buildCAPMT(eTable<ProgramMapSection> *ptr);
};
@@
-61,15
+61,17
@@
class eDVBServicePMTHandler: public Object
void channelStateChanged(iDVBChannel *);
ePtr<eConnection> m_channelStateChanged_connection;
void channelStateChanged(iDVBChannel *);
ePtr<eConnection> m_channelStateChanged_connection;
+ void channelEvent(iDVBChannel *, int event);
+ ePtr<eConnection> m_channelEvent_connection;
void PMTready(int error);
void PATready(int error);
void PMTready(int error);
void PATready(int error);
- int m_record;
- static int m_count;
+ int m_use_decode_demux;
+ uint8_t m_decode_demux_num;
+
public:
public:
- static int getCount() { return m_count; }
- eDVBServicePMTHandler(int record);
+ eDVBServicePMTHandler();
~eDVBServicePMTHandler();
enum
~eDVBServicePMTHandler();
enum
@@
-80,14
+82,18
@@
public:
eventNoPATEntry, // no pat entry for the corresponding SID could be found
eventNoPMT, // no pmt could be received (timeout)
eventNewProgramInfo, // we just received a PMT
eventNoPATEntry, // no pat entry for the corresponding SID could be found
eventNoPMT, // no pmt could be received (timeout)
eventNewProgramInfo, // we just received a PMT
- eventTuned // a channel was sucessfully (re-)tuned in, you may start additional filters now
+ eventTuned, // a channel was sucessfully (re-)tuned in, you may start additional filters now
+
+ eventSOF, // seek pre start
+ eventEOF, // a file playback did end
};
Signal1<void,int> serviceEvent;
};
Signal1<void,int> serviceEvent;
-
+
struct videoStream
{
int pid;
struct videoStream
{
int pid;
+ int component_tag;
};
struct audioStream
};
struct audioStream
@@
-107,16
+113,23
@@
public:
// ca info
int pcrPid;
int pmtPid;
// ca info
int pcrPid;
int pmtPid;
+ int textPid;
+ bool isCrypted;
};
int getProgramInfo(struct program &program);
};
int getProgramInfo(struct program &program);
- int getDemux(ePtr<iDVBDemux> &demux);
+ int getDataDemux(ePtr<iDVBDemux> &demux);
+ int getDecodeDemux(ePtr<iDVBDemux> &demux);
+
int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
int getService(eServiceReferenceDVB &service) { service = m_reference; return 0; }
int getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
int getChannel(eUsePtr<iDVBChannel> &channel);
int getPVRChannel(ePtr<iDVBPVRChannel> &pvr_channel);
int getService(eServiceReferenceDVB &service) { service = m_reference; return 0; }
int getPMT(ePtr<eTable<ProgramMapSection> > &ptr) { return m_PMT.getCurrent(ptr); }
int getChannel(eUsePtr<iDVBChannel> &channel);
- int tune(eServiceReferenceDVB &ref);
+ int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0);
+ void free();
+
+ int m_pmt_pid;
};
#endif
};
#endif