mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 9321aaada0.
This commit is contained in:
Thilo Graf
2024-10-07 20:24:49 +02:00
parent 1ed6a667bc
commit ec7af382bb
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,7 @@ CZapitChannel * CServiceManager::FindChannelByName(std::string name)
} }
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,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;
} }