mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 09:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/include/zapit/bouquets.h: remove CmpChannel..

Browse Source
This commit is contained in:
[CST] Focus
2012-04-05 18:58:25 +04:00
parent 07a250130b
commit 432925be80
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/zapit/include/zapit/bouquets.h
View File

@@ -28,7 +28,8 @@ typedef ZapitChannelList::iterator zapit_list_it_t;
class CZapitBouquet class CZapitBouquet
{ {
public: public:
std::string Name; std::string Name;
bool bHidden; bool bHidden;
bool bLocked; bool bLocked;
@@ -46,9 +47,9 @@ class CZapitBouquet
void removeService(CZapitChannel* oldChannel); void removeService(CZapitChannel* oldChannel);
void removeService(const t_channel_id channel_id, unsigned char serviceType = ST_RESERVED) { removeService(getChannelByChannelID(channel_id, serviceType)); } void removeService(const t_channel_id channel_id, unsigned char serviceType = ST_RESERVED) { removeService(getChannelByChannelID(channel_id, serviceType)); }
void moveService (const unsigned int oldPosition, const unsigned int newPosition, const unsigned char serviceType); void moveService (const unsigned int oldPosition, const unsigned int newPosition, const unsigned char serviceType);
size_t recModeRadioSize(const transponder_id_t transponder_id); size_t recModeRadioSize(const transponder_id_t transponder_id);
size_t recModeTVSize (const transponder_id_t transponder_id); size_t recModeTVSize (const transponder_id_t transponder_id);
CZapitChannel* getChannelByChannelID(const t_channel_id channel_id, const unsigned char serviceType = ST_RESERVED); CZapitChannel* getChannelByChannelID(const t_channel_id channel_id, const unsigned char serviceType = ST_RESERVED);
@@ -124,18 +125,6 @@ class CBouquetManager
* Hence we need a compare function that considers the whole unicode charset. * Hence we need a compare function that considers the whole unicode charset.
* For instance all countless variants of the letter a have to be regarded as the same letter. * For instance all countless variants of the letter a have to be regarded as the same letter.
*/ */
struct CmpChannelByChName: public binary_function <const CZapitChannel * const, const CZapitChannel * const, bool>
{
static bool comparetolower(const char a, const char b)
{
return tolower(a) < tolower(b);
};
bool operator() (const CZapitChannel * const c1, const CZapitChannel * const c2)
{
return std::lexicographical_compare(c1->getName().begin(), c1->getName().end(), c2->getName().begin(), c2->getName().end(), comparetolower);
};
};
struct CmpBouquetByChName: public binary_function <const CZapitBouquet * const, const CZapitBouquet * const, bool> struct CmpBouquetByChName: public binary_function <const CZapitBouquet * const, const CZapitBouquet * const, bool>
{ {
@@ -151,13 +140,4 @@ struct CmpBouquetByChName: public binary_function <const CZapitBouquet * const,
}; };
}; };
struct CmpChannelByChNum: public binary_function <const CZapitChannel * const, const CZapitChannel * const, bool>
{
bool operator() (const CZapitChannel * const c1, const CZapitChannel * const c2)
{
return c1->number < c2->number;
;
};
};
#endif /* __bouquets_h__ */ #endif /* __bouquets_h__ */