epgplus: bind display of channelnumbers to channelists's setting;

fix position of channelentry


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b44c162b4
Author: TangoCash <eric@loxat.de>
Date: 2017-04-10 (Mon, 10 Apr 2017)

Origin message was:
------------------
- epgplus: bind display of channelnumbers to channelists's setting;

fix position of channelentry


------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2017-04-10 10:26:21 +02:00
committed by vanhofen
parent c88fafbe61
commit a2923c5fda

View File

@@ -329,7 +329,10 @@ EpgPlus::ChannelEntry::ChannelEntry(const CZapitChannel * pchannel, int pindex,
{
std::stringstream pdisplayName;
//pdisplayName << pindex + 1 << " " << pchannel->getName();
pdisplayName << pchannel->number << " " << pchannel->getName();
if (g_settings.channellist_show_numbers)
pdisplayName << pchannel->number << " " << pchannel->getName();
else
pdisplayName << pchannel->getName();
this->displayName = pdisplayName.str();
}
@@ -580,7 +583,7 @@ void EpgPlus::createChannelEntries(int selectedChannelEntryIndex)
CZapitChannel * channel = (*this->channelList)[i];
ChannelEntry *channelEntry = new ChannelEntry(channel, i, this->frameBuffer, this->footer, this->bouquetList, this->channelsTableX + 2, yPosChannelEntry, this->channelsTableWidth);
ChannelEntry *channelEntry = new ChannelEntry(channel, i, this->frameBuffer, this->footer, this->bouquetList, this->channelsTableX, yPosChannelEntry, this->channelsTableWidth);
//printf("Going to get getEventsServiceKey for %llx\n", (channel->getChannelID() & 0xFFFFFFFFFFFFULL));
CChannelEventList channelEventList;
CEitManager::getInstance()->getEventsServiceKey(channel->getEpgID(), channelEventList);