From 583c8316e8a8ebd85384ad1dcc6c3445ae10c79a Mon Sep 17 00:00:00 2001 From: striper Date: Thu, 1 Dec 2011 18:37:49 +0000 Subject: [PATCH] - fix display of western satellites in infoviewer git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1928 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/infoviewer.cpp | 2 +- src/zapit/src/descriptors.cpp | 2 +- src/zapit/src/fastscan.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 179627657..9350302cf 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -731,7 +731,7 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con fprintf(stderr, "after showchannellogo, mode = %d ret = %d logo_ok = %d\n",g_settings.infobar_show_channellogo, ChannelLogoMode, logo_ok); int ChanNumYPos = BoxStartY + ChanHeight; - if (g_settings.infobar_sat_display && satellitePosition >= 0 && !satellitePositions.empty()) { + if (g_settings.infobar_sat_display && !satellitePositions.empty()) { sat_iterator_t sit = satellitePositions.find(satellitePosition); if (sit != satellitePositions.end()) { diff --git a/src/zapit/src/descriptors.cpp b/src/zapit/src/descriptors.cpp index 546d88858..dc43bc83b 100644 --- a/src/zapit/src/descriptors.cpp +++ b/src/zapit/src/descriptors.cpp @@ -625,7 +625,7 @@ void service_descriptor(const unsigned char * const buffer, const t_service_id s int bouquetId; char pname[100]; if (CFrontend::getInstance()->getInfo()->type == FE_QPSK) - snprintf(pname, 100, "[%c%03d.%d] %s", satellitePosition >= 0? 'E' : 'W', abs(satellitePosition)/10, abs(satellitePosition)%10, providerName.c_str()); + snprintf(pname, 100, "[%c%03d.%d] %s", satellitePosition > 0? 'E' : 'W', abs(satellitePosition)/10, abs(satellitePosition)%10, providerName.c_str()); else snprintf(pname, 100, "%s", providerName.c_str()); diff --git a/src/zapit/src/fastscan.cpp b/src/zapit/src/fastscan.cpp index cba141d73..6cbc54def 100644 --- a/src/zapit/src/fastscan.cpp +++ b/src/zapit/src/fastscan.cpp @@ -312,7 +312,7 @@ bool CServiceScan::ParseFst(unsigned short pid, fast_scan_operator_t * op) char pname[100]; if (CFrontend::getInstance()->getInfo()->type == FE_QPSK) - snprintf(pname, 100, "[%c%03d.%d] %s", satellitePosition >= 0? 'E' : 'W', abs(satellitePosition)/10, abs(satellitePosition)%10, providerName.c_str()); + snprintf(pname, 100, "[%c%03d.%d] %s", satellitePosition > 0? 'E' : 'W', abs(satellitePosition)/10, abs(satellitePosition)%10, providerName.c_str()); else snprintf(pname, 100, "%s", providerName.c_str());