mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 23:13:13 +02:00
getservices.cpp: fix e2tv streaming on cable boxes
This commit is contained in:
@@ -245,7 +245,7 @@ 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;
|
||||
return &(it->second);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
@@ -254,11 +254,19 @@ 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 *ret = &it->second;
|
||||
if ((ret->getChannelID() & 0xFFFFFFFFFFFFULL) != (channel_id & 0xFFFFFFFFFFFFULL))
|
||||
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 == ret->getSatellitePosition())
|
||||
return ret;
|
||||
if (pos == channel.getSatellitePosition())
|
||||
return &channel;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user