From e04f6e2d0ac042f1e23d367469603970a9a1fdf7 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 18 Apr 2012 19:00:43 +0400 Subject: [PATCH] gui/infoviewer.cpp: dont use zapit client getCurrentServiceInfo() Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0b8adae5bddea5a87b4005b584bb25428201e52a Author: [CST] Focus Date: 2012-04-18 (Wed, 18 Apr 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 6d0f4cd65..da46b82e8 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1570,13 +1570,12 @@ void CInfoViewer::showSNR () char freq[20]; newfreq = false; - CZapitClient::CCurrentServiceInfo si = g_Zapit->getCurrentServiceInfo (); - std::string polarisation; + std::string polarisation = ""; if (g_info.delivery_system == DVB_S) - polarisation = transponder::pol(si.polarisation); - else - polarisation = ""; - snprintf (freq, sizeof(freq), "%d.%d MHz %s", si.tsfrequency / 1000, si.tsfrequency % 1000, polarisation.c_str()); + polarisation = transponder::pol(CFEManager::getInstance()->getLiveFE()->getPolarization()); + + int frequency = CFEManager::getInstance()->getLiveFE()->getFrequency(); + snprintf (freq, sizeof(freq), "%d.%d MHz %s", frequency / 1000, frequency % 1000, polarisation.c_str()); int satNameWidth = g_SignalFont->getRenderWidth (freq); g_SignalFont->RenderString (3 + BoxStartX + ((ChanWidth - satNameWidth) / 2), BoxStartY + 2 * chanH - 3, satNameWidth, freq, SDT_freq_update ? COL_COLORED_EVENTS_INFOBAR:COL_INFOBAR);