mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
- epgplus: bind display of channelnumbers to channelists's setting;
fix position of channelentry
This commit is contained in:
@@ -329,7 +329,10 @@ EpgPlus::ChannelEntry::ChannelEntry(const CZapitChannel * pchannel, int pindex,
|
|||||||
{
|
{
|
||||||
std::stringstream pdisplayName;
|
std::stringstream pdisplayName;
|
||||||
//pdisplayName << pindex + 1 << " " << pchannel->getName();
|
//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();
|
this->displayName = pdisplayName.str();
|
||||||
}
|
}
|
||||||
@@ -580,7 +583,7 @@ void EpgPlus::createChannelEntries(int selectedChannelEntryIndex)
|
|||||||
|
|
||||||
CZapitChannel * channel = (*this->channelList)[i];
|
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));
|
//printf("Going to get getEventsServiceKey for %llx\n", (channel->getChannelID() & 0xFFFFFFFFFFFFULL));
|
||||||
CChannelEventList channelEventList;
|
CChannelEventList channelEventList;
|
||||||
CEitManager::getInstance()->getEventsServiceKey(channel->getEpgID(), channelEventList);
|
CEitManager::getInstance()->getEventsServiceKey(channel->getEpgID(), channelEventList);
|
||||||
|
Reference in New Issue
Block a user