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

zapit: channel.h - change comparative criteria for freq sort

Browse Source
This commit is contained in:
Jacek Jendrzej
2014-11-06 19:29:09 +01:00
parent 644dc460a2
commit ce87898d8f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/zapit/include/zapit/channel.h
View File

@@ -312,10 +312,10 @@ struct CmpChannelByFreq: public std::binary_function <const CZapitChannel * cons
bool operator() (const CZapitChannel * const c1, const CZapitChannel * const c2) bool operator() (const CZapitChannel * const c1, const CZapitChannel * const c2)
{ {
if(c1->getFreqId() == c2->getFreqId()) if((c1->getTransponderId() == c2->getTransponderId()) && ((uint64_t)c1->getFreqId() <<32 | c1->polarization <<16 | c1->getSatellitePosition()) == ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16| c2->getSatellitePosition()))
return std::lexicographical_compare(c1->getName().begin(), c1->getName().end(), c2->getName().begin(), c2->getName().end(), comparetolower); return std::lexicographical_compare(c1->getName().begin(), c1->getName().end(), c2->getName().begin(), c2->getName().end(), comparetolower);
else else
return c1->getFreqId() < c2->getFreqId(); return ((uint64_t)c1->getFreqId()<<32 | c1->polarization <<16 | c1->getSatellitePosition()) < ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16 | c2->getSatellitePosition());
; ;
}; };
}; };