From 0656ab25da129a7e78b5dae19b7358541640d0db Mon Sep 17 00:00:00 2001 From: striper Date: Thu, 11 Aug 2011 17:04:21 +0000 Subject: [PATCH] - fix lots of stuff for first position in cables.xml/satellites.xml (Satbaby - THX for the hint!) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1619 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/daemonc/remotecontrol.cpp | 2 +- src/gui/infoviewer.cpp | 2 +- src/zapit/include/zapit/types.h | 2 +- src/zapit/src/descriptors.cpp | 2 +- src/zapit/src/fastscan.cpp | 2 +- src/zapit/src/zapit.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/daemonc/remotecontrol.cpp b/src/daemonc/remotecontrol.cpp index f30196d0f..ffb5e1e7a 100644 --- a/src/daemonc/remotecontrol.cpp +++ b/src/daemonc/remotecontrol.cpp @@ -83,7 +83,7 @@ CSubService::CSubService(const t_original_network_id anoriginal_network_id, cons t_channel_id CSubService::getChannelID(void) const { - return ((uint64_t) ( satellitePosition > 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 48) | + return ((uint64_t) ( satellitePosition >= 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 48) | (uint64_t) CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID(service.service_id, service.original_network_id, service.transport_stream_id); } diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index ea7be6b5e..bf21b69cb 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -674,7 +674,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 && satellitePosition >= 0 && !satellitePositions.empty()) { sat_iterator_t sit = satellitePositions.find(satellitePosition); if (sit != satellitePositions.end()) { diff --git a/src/zapit/include/zapit/types.h b/src/zapit/include/zapit/types.h index e6bff41e5..8c6564ddc 100644 --- a/src/zapit/include/zapit/types.h +++ b/src/zapit/include/zapit/types.h @@ -35,7 +35,7 @@ typedef uint16_t freq_id_t; #define PRINTF_TRANSPONDER_ID_TYPE "%12llx" #define TRANSPONDER_ID_NOT_TUNED 0 #define CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID(freq, satellitePosition,original_network_id,transport_stream_id) \ - ( ((uint64_t)freq << 48) | ((uint64_t) ( satellitePosition > 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 32) | ((uint64_t)transport_stream_id << 16) | (uint64_t)original_network_id) + ( ((uint64_t)freq << 48) | ((uint64_t) ( satellitePosition >= 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 32) | ((uint64_t)transport_stream_id << 16) | (uint64_t)original_network_id) #define GET_ORIGINAL_NETWORK_ID_FROM_TRANSPONDER_ID(transponder_id) ((t_original_network_id)(transponder_id )) #define GET_TRANSPORT_STREAM_ID_FROM_TRANSPONDER_ID(transponder_id) ((t_transport_stream_id)(transponder_id >> 16)) #define GET_SATELLITEPOSITION_FROM_TRANSPONDER_ID(transponder_id) ((t_satellite_position )(transponder_id >> 32)) diff --git a/src/zapit/src/descriptors.cpp b/src/zapit/src/descriptors.cpp index 12ccee459..99b7423b9 100644 --- a/src/zapit/src/descriptors.cpp +++ b/src/zapit/src/descriptors.cpp @@ -665,7 +665,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 639cf9c04..f2a5d4522 100644 --- a/src/zapit/src/fastscan.cpp +++ b/src/zapit/src/fastscan.cpp @@ -355,7 +355,7 @@ int parse_fst(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()); diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index e76360cb6..84eb4ffb7 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -1598,7 +1598,7 @@ printf("[zapit] recording mode: %d\n", msgSetRecordMode.activate);fflush(stdout) t_satellite_position satellitePosition = g_current_channel ? g_current_channel->getSatellitePosition() : 0; t_channel_id sub_channel_id = - ((uint64_t) ( satellitePosition > 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 48) | + ((uint64_t) ( satellitePosition >= 0 ? satellitePosition : (uint64_t)(0xF000+ abs(satellitePosition))) << 48) | (uint64_t) CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID(msgAddSubService.service_id, msgAddSubService.original_network_id, msgAddSubService.transport_stream_id); DBG("NVOD insert %llx\n", sub_channel_id); nvodchannels.insert (