git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add lcd-includes
[enigma2.git]
/
lib
/
dvb
/
idvb.h
diff --git
a/lib/dvb/idvb.h
b/lib/dvb/idvb.h
index add9ba8526829569ca8bc077381a5bc0ff5a1f70..d353611d01d815b2e0aed29a575bd9f88688a382 100644
(file)
--- a/
lib/dvb/idvb.h
+++ b/
lib/dvb/idvb.h
@@
-15,6
+15,13
@@
#include <libsig_comp.h>
#include <connection.h>
#include <libsig_comp.h>
#include <connection.h>
+struct eBouquet
+{
+ std::string m_bouquet_name;
+ std::string m_path;
+ std::list<eServiceReference> m_services;
+};
+
// bitte KEINE operator int() definieren, sonst bringt das ganze nix!
struct eTransportStreamID
{
// bitte KEINE operator int() definieren, sonst bringt das ganze nix!
struct eTransportStreamID
{
@@
-180,7
+187,8
@@
public:
bool cacheEmpty() { return m_cache.empty(); }
eDVBService();
bool cacheEmpty() { return m_cache.empty(); }
eDVBService();
- std::string m_service_name;
+ /* m_service_name_sort is uppercase, with special chars removed, to increase sort performance. */
+ std::string m_service_name, m_service_name_sort;
std::string m_provider_name;
int m_flags;
std::string m_provider_name;
int m_flags;
@@
-194,7
+202,7
@@
public:
RESULT getName(const eServiceReference &ref, std::string &name);
int getLength(const eServiceReference &ref);
RESULT getName(const eServiceReference &ref, std::string &name);
int getLength(const eServiceReference &ref);
- // for filtering:
+ /* for filtering: */
int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
};
int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
};
@@
-208,6
+216,7
@@
class iDVBChannelListQuery: public iObject
{
public:
virtual RESULT getNextResult(eServiceReferenceDVB &ref)=0;
{
public:
virtual RESULT getNextResult(eServiceReferenceDVB &ref)=0;
+ virtual int compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b)=0;
};
class eDVBChannelQuery: public iObject
};
class eDVBChannelQuery: public iObject
@@
-233,6
+242,10
@@
public:
int m_int;
eDVBChannelID m_channelid;
int m_int;
eDVBChannelID m_channelid;
+ /* sort is only valid in root, and must be from the enum above. */
+ int m_sort;
+ std::string m_bouquet_name;
+
static RESULT compile(ePtr<eDVBChannelQuery> &res, std::string query);
ePtr<eDVBChannelQuery> m_p1, m_p2;
static RESULT compile(ePtr<eDVBChannelQuery> &res, std::string query);
ePtr<eDVBChannelQuery> m_p1, m_p2;
@@
-249,7
+262,9
@@
public:
virtual RESULT addService(const eServiceReferenceDVB &service, eDVBService *service)=0;
virtual RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service)=0;
virtual RESULT addService(const eServiceReferenceDVB &service, eDVBService *service)=0;
virtual RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service)=0;
- virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query)=0;
+ virtual RESULT getBouquet(const eServiceReference &ref, const eBouquet* &bouquet)=0;
+
+ virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
};
class SatelliteDeliverySystemDescriptor;
};
class SatelliteDeliverySystemDescriptor;
@@
-429,13
+444,15
@@
public:
};
virtual RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)=0;
virtual RESULT getState(int &state)=0;
};
virtual RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)=0;
virtual RESULT getState(int &state)=0;
+
+ /* demux capabilities */
enum
{
enum
{
- cap
_decode
,
- cap_ci
+ cap
Decode = 1
,
+ /* capCI = 2 */
};
virtual RESULT setCIRouting(const eDVBCIRouting &routing)=0;
};
virtual RESULT setCIRouting(const eDVBCIRouting &routing)=0;
- virtual RESULT getDemux(ePtr<iDVBDemux> &demux)=0;
+ virtual RESULT getDemux(ePtr<iDVBDemux> &demux
, int cap=0
)=0;
/* direct frontend access for raw channels and/or status inquiries. */
virtual RESULT getFrontend(ePtr<iDVBFrontend> &frontend)=0;
/* direct frontend access for raw channels and/or status inquiries. */
virtual RESULT getFrontend(ePtr<iDVBFrontend> &frontend)=0;
@@
-461,6
+478,7
@@
public:
virtual RESULT getLength(pts_t &pts) = 0;
virtual RESULT getCurrentPosition(pts_t &pos) = 0;
virtual RESULT getLength(pts_t &pts) = 0;
virtual RESULT getCurrentPosition(pts_t &pos) = 0;
+ virtual RESULT seekTo(pts_t &pts) = 0;
// seekTo ...
};
// seekTo ...
};
@@
-477,6
+495,7
@@
public:
virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
virtual RESULT getSTC(pts_t &pts)=0;
virtual RESULT getCADemuxID(uint8_t &id)=0;
virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
virtual RESULT getSTC(pts_t &pts)=0;
virtual RESULT getCADemuxID(uint8_t &id)=0;
+ virtual RESULT flush()=0;
};
class iTSMPEGDecoder: public iObject
};
class iTSMPEGDecoder: public iObject