mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 18:01:06 +02:00
Get satellite name from CServiceManager
Origin commit data
------------------
Branch: ni/coolstream
Commit: 060a58d59c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -49,7 +49,7 @@
|
||||
#include <gui/widget/icons.h>
|
||||
|
||||
#include <zapit/getservices.h>
|
||||
#include <zapit/frontend_c.h>
|
||||
#include <zapit/femanager.h>
|
||||
|
||||
#include <zapit/client/zapitclient.h>
|
||||
extern CBouquetManager *g_bouquetManager;
|
||||
@@ -177,20 +177,22 @@ void CBEChannelWidget::paintDetails(int index)
|
||||
|
||||
transponder_id_t ct = (*Channels)[index]->getTransponderId();
|
||||
transponder_list_t::iterator tpI = transponders.find(ct);
|
||||
sat_iterator_t sit = satellitePositions.find((*Channels)[index]->getSatellitePosition());
|
||||
//sat_iterator_t sit = satellitePositions.find((*Channels)[index]->getSatellitePosition());
|
||||
std::string satname = CServiceManager::getInstance()->GetSatelliteName((*Channels)[index]->getSatellitePosition()).c_str();
|
||||
|
||||
len = snprintf(buf, sizeof(buf), "%d ", (*Channels)[index]->getFreqId());
|
||||
|
||||
if(tpI != transponders.end()) {
|
||||
char * f, *s, *m;
|
||||
switch(CFrontend::getInstance()->getInfo()->type)
|
||||
CFrontend * frontend = CFEManager::getInstance()->getLiveFE();
|
||||
switch(frontend->getInfo()->type)
|
||||
{
|
||||
case FE_QPSK:
|
||||
CFrontend::getInstance()->getDelSys(tpI->second.feparams.u.qpsk.fec_inner, dvbs_get_modulation(tpI->second.feparams.u.qpsk.fec_inner), f, s, m);
|
||||
frontend->getDelSys(tpI->second.feparams.u.qpsk.fec_inner, dvbs_get_modulation(tpI->second.feparams.u.qpsk.fec_inner), f, s, m);
|
||||
len += snprintf(&buf[len], sizeof(buf) - len, "%c %d %s %s %s ", tpI->second.polarization ? 'V' : 'H', tpI->second.feparams.u.qpsk.symbol_rate/1000, f, s, m);
|
||||
break;
|
||||
case FE_QAM:
|
||||
CFrontend::getInstance()->getDelSys(tpI->second.feparams.u.qam.fec_inner, tpI->second.feparams.u.qam.modulation, f, s, m);
|
||||
frontend->getDelSys(tpI->second.feparams.u.qam.fec_inner, tpI->second.feparams.u.qam.modulation, f, s, m);
|
||||
len += snprintf(&buf[len], sizeof(buf) - len, "%d %s %s %s ", tpI->second.feparams.u.qam.symbol_rate/1000, f, s, m);
|
||||
break;
|
||||
case FE_OFDM:
|
||||
@@ -203,13 +205,17 @@ void CBEChannelWidget::paintDetails(int index)
|
||||
snprintf(&buf[len], sizeof(buf) - len, "(%s)", (*Channels)[index]->pname);
|
||||
}
|
||||
else {
|
||||
snprintf(&buf[len], sizeof(buf) - len, "(%s)", satname.c_str());
|
||||
#if 0
|
||||
if(sit != satellitePositions.end()) {
|
||||
snprintf(&buf[len], sizeof(buf) - len, "(%s)", sit->second.name.c_str());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if(sit != satellitePositions.end()) {
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ fheight, width - 30, sit->second.name.c_str(), COL_MENUCONTENTDARK, 0, true);
|
||||
//if(sit != satellitePositions.end())
|
||||
{
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ fheight, width - 30, satname.c_str(), COL_MENUCONTENTDARK, 0, true);
|
||||
}
|
||||
g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST]->RenderString(x+ 10, y+ height+ 5+ 2*fheight, width - 30, buf, COL_MENUCONTENTDARK, 0, true);
|
||||
}
|
||||
|
Reference in New Issue
Block a user