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 no more turning positioner after leave positioner setup in some cases
[enigma2.git]
/
lib
/
dvb
/
pmt.h
diff --git
a/lib/dvb/pmt.h
b/lib/dvb/pmt.h
index 9b33d30b9bacf984f1b99dff214c86d56aa17400..483c06b15ae3007c06514ca7760d30fdf7a05300 100644
(file)
--- a/
lib/dvb/pmt.h
+++ b/
lib/dvb/pmt.h
@@
-3,6
+3,7
@@
#ifndef SWIG
#include <map>
#ifndef SWIG
#include <map>
+#include <lib/base/buffer.h>
#include <lib/dvb/idvb.h>
#include <lib/dvb/dvb.h>
#include <lib/dvb/idemux.h>
#include <lib/dvb/idvb.h>
#include <lib/dvb/dvb.h>
#include <lib/dvb/idemux.h>
@@
-35,7
+36,8
@@
typedef std::map<iDVBChannel*, channel_data*> ChannelMap;
class eDVBCAService: public Object
{
class eDVBCAService: public Object
{
- eSocketNotifier *m_sn;
+ eIOBuffer m_buffer;
+ ePtr<eSocketNotifier> m_sn;
eServiceReferenceDVB m_service;
uint8_t m_used_demux[32];
unsigned int m_prev_build_hash;
eServiceReferenceDVB m_service;
uint8_t m_used_demux[32];
unsigned int m_prev_build_hash;
@@
-44,7
+46,7
@@
class eDVBCAService: public Object
struct sockaddr_un m_servaddr;
unsigned int m_sendstate;
unsigned char m_capmt[2048];
struct sockaddr_un m_servaddr;
unsigned int m_sendstate;
unsigned char m_capmt[2048];
- e
Timer
m_retryTimer;
+ e
Ptr<eTimer>
m_retryTimer;
void sendCAPMT();
void Connect();
void socketCB(int what);
void sendCAPMT();
void Connect();
void socketCB(int what);
@@
-76,7
+78,7
@@
class eDVBServicePMTHandler: public Object
int m_last_channel_state;
eDVBCAService *m_ca_servicePtr;
int m_last_channel_state;
eDVBCAService *m_ca_servicePtr;
- e
DVBScan *
m_dvb_scan; // for sdt scan
+ e
Ptr<eDVBScan>
m_dvb_scan; // for sdt scan
eAUTable<eTable<ProgramMapSection> > m_PMT;
eAUTable<eTable<ProgramAssociationSection> > m_PAT;
eAUTable<eTable<ProgramMapSection> > m_PMT;
eAUTable<eTable<ProgramAssociationSection> > m_PAT;
@@
-121,6
+123,7
@@
public:
eventNewProgramInfo, // we just received a PMT
eventTuned, // a channel was sucessfully (re-)tuned in, you may start additional filters now
eventNewProgramInfo, // we just received a PMT
eventTuned, // a channel was sucessfully (re-)tuned in, you may start additional filters now
+ eventPreStart, // before start filepush thread
eventSOF, // seek pre start
eventEOF, // a file playback did end
eventSOF, // seek pre start
eventEOF, // a file playback did end
@@
-133,14
+136,15
@@
public:
{
int pid;
int component_tag;
{
int pid;
int component_tag;
- enum { vtMPEG2, vtMPEG4_H264 };
+ enum { vtMPEG2, vtMPEG4_H264
, vtMPEG1, vtMPEG4_Part2, vtVC1, vtVC1_SM
};
int type;
};
struct audioStream
{
int type;
};
struct audioStream
{
- int pid;
- enum { atMPEG, atAC3, atDTS, atAAC };
+ int pid,
+ rdsPid; // hack for some radio services which transmit radiotext on different pid (i.e. harmony fm, HIT RADIO FFH, ...)
+ enum { atMPEG, atAC3, atDTS, atAAC, atAACHE, atLPCM };
int type; // mpeg2, ac3, dts, ...
int component_tag;
int type; // mpeg2, ac3, dts, ...
int component_tag;
@@
-186,7
+190,6
@@
public:
int pmtPid;
int textPid;
bool isCrypted() { return !caids.empty(); }
int pmtPid;
int textPid;
bool isCrypted() { return !caids.empty(); }
-
PyObject *createPythonObject();
};
PyObject *createPythonObject();
};
@@
-202,7
+205,7
@@
public:
int getChannel(eUsePtr<iDVBChannel> &channel);
void resetCachedProgram() { m_have_cached_program = false; }
int getChannel(eUsePtr<iDVBChannel> &channel);
void resetCachedProgram() { m_have_cached_program = false; }
- int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false);
+ int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false
, eDVBService *service = 0
);
void free();
private:
bool m_have_cached_program;
void free();
private:
bool m_have_cached_program;