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

show PLI/PLC/PLM while scanning

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 568ccb91a5
Author: TangoCash <eric@loxat.de>
Date: 2017-12-04 (Mon, 04 Dec 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2017-12-04 09:46:04 +01:00
committed by vanhofen
parent e4c8b0ae13
commit 48718e0089
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/scan.cpp
View File

@@ -192,7 +192,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight();
mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
fw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getWidth(); fw = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getWidth();
width = w_max(fw * 42, 0); width = w_max(fw * 52, 0);
int tmp = (BAR_WIDTH + 4 + 7 * fw) * 2 + fw + 40; /* that's from the crazy calculation in showSNR() */ int tmp = (BAR_WIDTH + 4 + 7 * fw) * 2 + fw + 40; /* that's from the crazy calculation in showSNR() */
if (width < tmp) if (width < tmp)
width = w_max(tmp, 0); width = w_max(tmp, 0);
@@ -427,9 +427,9 @@ neutrino_msg_t CScanTs::handleMsg(neutrino_msg_t msg, neutrino_msg_data_t data)
CFrontend::getDelSys(feparams->delsys, feparams->fec_inner, feparams->modulation, f, s, m); CFrontend::getDelSys(feparams->delsys, feparams->fec_inner, feparams->modulation, f, s, m);
uint32_t freq = feparams->frequency/1000; uint32_t freq = feparams->frequency/1000;
if (CFrontend::isSat(feparams->delsys)) if (CFrontend::isSat(feparams->delsys))
snprintf(buffer,sizeof(buffer), "%u %c %d %s %s %s", freq, transponder::pol(feparams->polarization), feparams->symbol_rate/1000, f, s, m); snprintf(buffer,sizeof(buffer), "%u %c %d %s %s %s (%d/%d/%s)", freq, transponder::pol(feparams->polarization), feparams->symbol_rate/1000, f, s, m, feparams->plp_id, feparams->pls_code, transponder::getPLSMode(feparams->pls_mode).c_str());
else else
snprintf(buffer,sizeof(buffer), "%u %d %s %s", freq, feparams->symbol_rate/1000, s, m); snprintf(buffer,sizeof(buffer), "%u %d %s %s %d", freq, feparams->symbol_rate/1000, s, m, feparams->plp_id);
paintLine(xpos2, ypos_frequency, w - (7*fw), buffer); paintLine(xpos2, ypos_frequency, w - (7*fw), buffer);
} }
break; break;

2
src/zapit/include/zapit/transponder.h
View File

@@ -48,7 +48,7 @@ public:
void ddump(std::string label = "tp"); void ddump(std::string label = "tp");
static char pol(unsigned char pol); static char pol(unsigned char pol);
std::string description(void); std::string description(void);
std::string getPLSMode(const uint8_t pls_mode); static std::string getPLSMode(const uint8_t pls_mode);
delivery_system_t getDelSys(void) { return feparams.delsys; } delivery_system_t getDelSys(void) { return feparams.delsys; }
t_transport_stream_id getTransportStreamId(void) { return transport_stream_id; } t_transport_stream_id getTransportStreamId(void) { return transport_stream_id; }