gui/infoviewer.cpp: dont use zapit client getCurrentServiceInfo()

This commit is contained in:
[CST] Focus
2012-04-18 19:00:43 +04:00
parent 5464719e9c
commit 0b8adae5bd

View File

@@ -1570,13 +1570,12 @@ void CInfoViewer::showSNR ()
char freq[20]; char freq[20];
newfreq = false; newfreq = false;
CZapitClient::CCurrentServiceInfo si = g_Zapit->getCurrentServiceInfo (); std::string polarisation = "";
std::string polarisation;
if (g_info.delivery_system == DVB_S) if (g_info.delivery_system == DVB_S)
polarisation = transponder::pol(si.polarisation); polarisation = transponder::pol(CFEManager::getInstance()->getLiveFE()->getPolarization());
else
polarisation = ""; int frequency = CFEManager::getInstance()->getLiveFE()->getFrequency();
snprintf (freq, sizeof(freq), "%d.%d MHz %s", si.tsfrequency / 1000, si.tsfrequency % 1000, polarisation.c_str()); snprintf (freq, sizeof(freq), "%d.%d MHz %s", frequency / 1000, frequency % 1000, polarisation.c_str());
int satNameWidth = g_SignalFont->getRenderWidth (freq); 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); g_SignalFont->RenderString (3 + BoxStartX + ((ChanWidth - satNameWidth) / 2), BoxStartY + 2 * chanH - 3, satNameWidth, freq, SDT_freq_update ? COL_COLORED_EVENTS_INFOBAR:COL_INFOBAR);