Fix bouquet name in epgplus; Fix bitrate for radio channels; Show language settings before setup banner

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@688 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-07-29 11:25:43 +00:00
parent 5532bcb247
commit 913a94ce76
5 changed files with 72 additions and 21 deletions

View File

@@ -42,6 +42,7 @@
#include <zapit/client/zapittools.h>
#include <driver/rcinput.h>
#include <driver/screen_max.h>
#include <zapit/satconfig.h>
#include <algorithm>
#include <sstream>
@@ -369,6 +370,7 @@ void EpgPlus::ChannelEntry::paint (bool isSelected, time_t selectedTime)
this->width - 4, this->displayName, isSelected ? COL_MENUCONTENTSELECTED : COL_MENUCONTENT, 0, true);
if (isSelected) {
#if 0
for (uint32_t i = 0; i < this->bouquetList->Bouquets.size(); ++i) {
CBouquet *bouquet = this->bouquetList->Bouquets[i];
for (int j = 0; j < bouquet->channelList->getSize(); ++j) {
@@ -385,6 +387,15 @@ void EpgPlus::ChannelEntry::paint (bool isSelected, time_t selectedTime)
if (bouquet == NULL)
break;
}
#endif
if(this->channel->pname) {
this->footer->setBouquetChannelName(this->channel->pname, this->channel->getName());
} else {
sat_iterator_t sit = satellitePositions.find(this->channel->getSatellitePosition());
if(sit != satellitePositions.end()) {
this->footer->setBouquetChannelName(sit->second.name, this->channel->getName());
}
}
}
// paint the separation line
if (separationLineHeight > 0) {