From 48718e0089f77ce83d69a5a5363f971578bc2f58 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 4 Dec 2017 09:46:04 +0100 Subject: [PATCH] show PLI/PLC/PLM while scanning Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/568ccb91a5409e84fc2634ec427f491cf03eeda0 Author: TangoCash Date: 2017-12-04 (Mon, 04 Dec 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/scan.cpp | 6 +++--- src/zapit/include/zapit/transponder.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index 2dbaa6f16..f4c912a93 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -192,7 +192,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) hheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight(); mheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight(); 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() */ if (width < tmp) 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); uint32_t freq = feparams->frequency/1000; 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 - 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); } break; diff --git a/src/zapit/include/zapit/transponder.h b/src/zapit/include/zapit/transponder.h index 7d894e854..e76181c3b 100644 --- a/src/zapit/include/zapit/transponder.h +++ b/src/zapit/include/zapit/transponder.h @@ -48,7 +48,7 @@ public: void ddump(std::string label = "tp"); static char pol(unsigned char pol); 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; } t_transport_stream_id getTransportStreamId(void) { return transport_stream_id; }