From 0b44c162b40cfbb854199b878cd632e66c136fd0 Mon Sep 17 00:00:00 2001 From: Eric Loxat Date: Mon, 10 Apr 2017 10:26:21 +0200 Subject: [PATCH] - epgplus: bind display of channelnumbers to channelists's setting; fix position of channelentry --- src/gui/epgplus.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 3c82f4937..3a6c28e6e 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -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);