mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 08:23:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@688 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 913a94ce76
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-07-29 (Thu, 29 Jul 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-07-29 11:25:43 +00:00
parent 7b4f248060
commit 4db8b82638
5 changed files with 72 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/epgplus.cpp
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) {

21
src/gui/streaminfo2.cpp
View File

@@ -900,13 +900,30 @@ static cDemux * dmx;
int CStreamInfo2::ts_setup ()
{
#if 0
if (g_RemoteControl->current_PIDs.PIDs.vpid == 0)
return -1;
#endif
unsigned short vpid, apid = 0;
vpid = g_RemoteControl->current_PIDs.PIDs.vpid;
if(g_RemoteControl->current_PIDs.APIDs.size() > 0)
apid = g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid;
if(vpid == 0 && apid == 0)
return -1;
dmx = new cDemux(1);
dmx->Open(DMX_TP_CHANNEL, NULL, 3008 * 62);
dmx->pesFilter(g_RemoteControl->current_PIDs.PIDs.vpid);
dmx->Open(DMX_TP_CHANNEL, NULL, 3 * 3008 * 62);
if(vpid > 0) {
dmx->pesFilter(vpid);
if(apid > 0)
dmx->addPid(apid);
} else
dmx->pesFilter(apid);
dmx->Start();
gettimeofday (&first_tv, NULL);

2
src/gui/timerlist.cpp
View File

@@ -1147,7 +1147,7 @@ int CTimerList::newTimer()
mwtv->addItem(new CMenuForwarderNonLocalized((*channels)[j]->getName().c_str(), true, NULL, this, (std::string(cChannelId) + (*channels)[j]->getName()).c_str()));
}
if (!channels->empty())
mctv.addItem(new CMenuForwarderNonLocalized(g_bouquetManager->Bouquets[i]->Name.c_str(), true, NULL, mwtv));
mctv.addItem(new CMenuForwarderNonLocalized(g_bouquetManager->Bouquets[i]->bFav ? g_Locale->getText(LOCALE_FAVORITES_BOUQUETNAME) : g_bouquetManager->Bouquets[i]->Name.c_str() /*g_bouquetManager->Bouquets[i]->Name.c_str()*/, true, NULL, mwtv));
channels = &(g_bouquetManager->Bouquets[i]->radioChannels);