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

getservices.cpp: fix e2tv streaming on cable boxes

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbed77d8d1
Author: GetAway <get-away@t-online.de>
Date: 2024-05-03 (Fri, 03 May 2024)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
GetAway
2024-05-03 21:09:51 +02:00
committed by vanhofen
parent 371f806fdc
commit 21465ade0c
2 changed files with 19 additions and 12 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); //NI CZapitChannel* FindChannelByPattern(std::string pattern);
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,8 +220,7 @@ CZapitChannel * CServiceManager::FindChannelByName(std::string name)
return NULL; return NULL;
} }
//NI CZapitChannel* CServiceManager::FindChannelByPattern(std::string pattern)
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());
@@ -244,21 +243,29 @@ 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 *ret = &it->second; CZapitChannel &channel = it->second;
if ((ret->getChannelID() & 0xFFFFFFFFFFFFULL) != (channel_id & 0xFFFFFFFFFFFFULL)) if (CFrontend::isCable(channel.delsys))
continue; {
if (pos == ret->getSatellitePosition()) if ((channel.getChannelID() & 0xFFFFFFFFFFFFULL) == (channel_id & 0xFFFFFFFFFFFFULL))
return ret; return &channel;
}
else
{
if ((channel.getChannelID() & 0xFFFFFFFFFFFFULL) != (channel_id & 0xFFFFFFFFFFFFULL))
continue;
if (pos == channel.getSatellitePosition())
return &channel;
}
} }
return NULL; return NULL;
} }