From 74f5c527596ff40fbac3dff610dcc04917663c28 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 7 Oct 2024 20:24:49 +0200 Subject: [PATCH] Revert "getservices.cpp: fix e2tv streaming on cable boxes" This reverts commit 21465ade0c114609a2158ac40e123e9c1b60d256. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f87c24f45983c0e4fdee12c06040e2716c81edfc Author: vanhofen Date: 2024-10-07 (Mon, 07 Oct 2024) ------------------ This commit was generated by Migit --- src/zapit/include/zapit/getservices.h | 2 +- src/zapit/src/getservices.cpp | 29 ++++++++++----------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/zapit/include/zapit/getservices.h b/src/zapit/include/zapit/getservices.h index 30ec33c99..15fbabf01 100644 --- a/src/zapit/include/zapit/getservices.h +++ b/src/zapit/include/zapit/getservices.h @@ -128,7 +128,7 @@ class CServiceManager CZapitChannel* FindChannel(const t_channel_id channel_id, bool * current_is_nvod = NULL); CZapitChannel* FindChannelByName(std::string name); - CZapitChannel* FindChannelByPattern(std::string pattern); + CZapitChannel* FindChannelByPattern(std::string pattern); //NI CZapitChannel* FindCurrentChannel(const t_channel_id channel_id); CZapitChannel* FindChannel48(const t_channel_id channel_id); CZapitChannel* FindChannel48Pos(const t_channel_id channel_id, diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index 764749af9..4d9a74937 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -220,7 +220,8 @@ CZapitChannel * CServiceManager::FindChannelByName(std::string name) return NULL; } -CZapitChannel* CServiceManager::FindChannelByPattern(std::string pattern) +//NI +CZapitChannel * CServiceManager::FindChannelByPattern(std::string pattern) { for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) { //INFO("searching for %s in %s", pattern.c_str(), it->second.getName().c_str()); @@ -243,29 +244,21 @@ CZapitChannel * CServiceManager::FindCurrentChannel(const t_channel_id channel_i CZapitChannel * CServiceManager::FindChannel48(const t_channel_id channel_id) { for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) { - if ((it->second.getChannelID() & 0xFFFFFFFFFFFFULL) == (channel_id & 0xFFFFFFFFFFFFULL)) - return &(it->second); + if((it->second.getChannelID() & 0xFFFFFFFFFFFFULL) == (channel_id & 0xFFFFFFFFFFFFULL)) + return &it->second; } return NULL; } -CZapitChannel * CServiceManager::FindChannel48Pos(const t_channel_id channel_id, - const t_satellite_position pos) +CZapitChannel* CServiceManager::FindChannel48Pos(const t_channel_id channel_id, + const t_satellite_position pos) { for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) { - CZapitChannel &channel = it->second; - if (CFrontend::isCable(channel.delsys)) - { - if ((channel.getChannelID() & 0xFFFFFFFFFFFFULL) == (channel_id & 0xFFFFFFFFFFFFULL)) - return &channel; - } - else - { - if ((channel.getChannelID() & 0xFFFFFFFFFFFFULL) != (channel_id & 0xFFFFFFFFFFFFULL)) - continue; - if (pos == channel.getSatellitePosition()) - return &channel; - } + CZapitChannel *ret = &it->second; + if ((ret->getChannelID() & 0xFFFFFFFFFFFFULL) != (channel_id & 0xFFFFFFFFFFFFULL)) + continue; + if (pos == ret->getSatellitePosition()) + return ret; } return NULL; }