projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: add sort of servicelist including all required layers
[vuplus_dvbapp]
/
lib
/
dvb
/
idvb.h
diff --git
a/lib/dvb/idvb.h
b/lib/dvb/idvb.h
index
add9ba8
..
d94bf5f
100644
(file)
--- a/
lib/dvb/idvb.h
+++ b/
lib/dvb/idvb.h
@@
-180,7
+180,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
+195,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
+209,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
+235,9
@@
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;
+
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;