projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/pootle-import'
[vuplus_dvbapp]
/
lib
/
dvb
/
pmt.h
diff --git
a/lib/dvb/pmt.h
b/lib/dvb/pmt.h
index
40a226e
..
86b634f
100644
(file)
--- a/
lib/dvb/pmt.h
+++ b/
lib/dvb/pmt.h
@@
-185,7
+185,7
@@
public:
{
uint16_t caid;
int capid;
{
uint16_t caid;
int capid;
- bool operator< (const struct capid_pair &t) { return t.caid < caid; }
+ bool operator< (const struct capid_pair &t)
const
{ return t.caid < caid; }
};
std::vector<videoStream> videoStreams;
std::vector<audioStream> audioStreams;
};
std::vector<videoStream> videoStreams;
std::vector<audioStream> audioStreams;
@@
-211,7
+211,12
@@
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; }
+ /* deprecated interface */
int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0);
int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false, eDVBService *service = 0);
+
+ /* new interface */
+ int tuneExt(eServiceReferenceDVB &ref, int use_decode_demux, ePtr<iTsSource> &, const char *streaminfo_file, 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;