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 branch 'master' of git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
dvb
/
pmt.h
diff --git
a/lib/dvb/pmt.h
b/lib/dvb/pmt.h
index ff0ef046090e115ebec629af3bfbc97d50dff7b8..a9ca23f246308b44d750fcaee304b7fa99d5dc2b 100644
(file)
--- a/
lib/dvb/pmt.h
+++ b/
lib/dvb/pmt.h
@@
-135,14
+135,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;
@@
-188,7
+189,6
@@
public:
int pmtPid;
int textPid;
bool isCrypted() { return !caids.empty(); }
int pmtPid;
int textPid;
bool isCrypted() { return !caids.empty(); }
-
PyObject *createPythonObject();
};
PyObject *createPythonObject();
};
@@
-204,7
+204,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;