mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "getservices.cpp: fix e2tv streaming on cable boxes"

Browse Source 
This reverts commit 21465ade0c.


Origin commit data
------------------
Branch: ni/coolstream
Commit: f87c24f459
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-10-07 (Mon, 07 Oct 2024)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2024-10-07 20:24:49 +02:00
parent ace112e8c9
commit 74f5c52759
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zapit/include/zapit/getservices.h
View File

@@ -128,7 +128,7 @@ class CServiceManager
CZapitChannel* FindChannel(const t_channel_id channel_id, bool * current_is_nvod = NULL); CZapitChannel* FindChannel(const t_channel_id channel_id, bool * current_is_nvod = NULL);
CZapitChannel* FindChannelByName(std::string name); 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* FindCurrentChannel(const t_channel_id channel_id);
CZapitChannel* FindChannel48(const t_channel_id channel_id); CZapitChannel* FindChannel48(const t_channel_id channel_id);
CZapitChannel* FindChannel48Pos(const t_channel_id channel_id, CZapitChannel* FindChannel48Pos(const t_channel_id channel_id,

29
src/zapit/src/getservices.cpp
View File

@@ -220,7 +220,8 @@ CZapitChannel * CServiceManager::FindChannelByName(std::string name)
return NULL; 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) { 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()); //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) CZapitChannel * CServiceManager::FindChannel48(const t_channel_id channel_id)
{ {
for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) { for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) {
if ((it->second.getChannelID() & 0xFFFFFFFFFFFFULL) == (channel_id & 0xFFFFFFFFFFFFULL)) if((it->second.getChannelID() & 0xFFFFFFFFFFFFULL) == (channel_id & 0xFFFFFFFFFFFFULL))
return &(it->second); return &it->second;
} }
return NULL; return NULL;
} }
CZapitChannel * CServiceManager::FindChannel48Pos(const t_channel_id channel_id, CZapitChannel* CServiceManager::FindChannel48Pos(const t_channel_id channel_id,
const t_satellite_position pos) const t_satellite_position pos)
{ {
for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) { for (channel_map_iterator_t it = allchans.begin(); it != allchans.end(); ++it) {
CZapitChannel &channel = it->second; CZapitChannel *ret = &it->second;
if (CFrontend::isCable(channel.delsys)) if ((ret->getChannelID() & 0xFFFFFFFFFFFFULL) != (channel_id & 0xFFFFFFFFFFFFULL))
{ continue;
if ((channel.getChannelID() & 0xFFFFFFFFFFFFULL) == (channel_id & 0xFFFFFFFFFFFFULL)) if (pos == ret->getSatellitePosition())
return &channel; return ret;
}
else
{
if ((channel.getChannelID() & 0xFFFFFFFFFFFFULL) != (channel_id & 0xFFFFFFFFFFFFULL))
continue;
if (pos == channel.getSatellitePosition())
return &channel;
}
} }
return NULL; return NULL;
} }