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

nhttpd use epg id to get events

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52f4312aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-05-11 (Wed, 11 May 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2016-05-11 12:52:11 +02:00
parent 1262c43404
commit 8525df611a
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -1478,8 +1478,6 @@ std::string CControlAPI::channelEPGformated(CyhookHandler *hh, int bouquetnr, t_
{ {
std::string result = ""; std::string result = "";
std::string channelData = ""; std::string channelData = "";
CChannelEventList eList;
CEitManager::getInstance()->getEventsServiceKey(channel_id, eList);
channelData += hh->outPair("channel_name", hh->outValue(NeutrinoAPI->GetServiceName(channel_id)), true); channelData += hh->outPair("channel_name", hh->outValue(NeutrinoAPI->GetServiceName(channel_id)), true);
channelData += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id), true); channelData += hh->outPair("channel_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id), true);
channelData += hh->outPair("channel_short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id & 0xFFFFFFFFFFFFULL), (bouquetnr > -1)); channelData += hh->outPair("channel_short_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel_id & 0xFFFFFFFFFFFFULL), (bouquetnr > -1));
@@ -1490,6 +1488,15 @@ std::string CControlAPI::channelEPGformated(CyhookHandler *hh, int bouquetnr, t_
int i = 0; int i = 0;
CChannelEventList::iterator eventIterator; CChannelEventList::iterator eventIterator;
bool isFirstLine = true; bool isFirstLine = true;
t_channel_id epg_id = channel_id;
CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id);
if (ch)
epg_id = ch->getEpgID();
CChannelEventList eList;
CEitManager::getInstance()->getEventsServiceKey(epg_id, eList);
for (eventIterator = eList.begin(); eventIterator != eList.end(); ++eventIterator, i++) { for (eventIterator = eList.begin(); eventIterator != eList.end(); ++eventIterator, i++) {
if ((max != -1 && i >= max) || (stoptime != -1 && eventIterator->startTime >= stoptime)) if ((max != -1 && i >= max) || (stoptime != -1 && eventIterator->startTime >= stoptime))
break; break;

8
src/nhttpd/tuxboxapi/neutrinoapi.cpp
View File

@@ -295,7 +295,13 @@ void CNeutrinoAPI::GetChannelEvent(t_channel_id channel_id, CChannelEvent &event
{ {
OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(pmutex); OpenThreads::ScopedPointerLock<OpenThreads::Mutex> lock(pmutex);
event.eventID = 0; event.eventID = 0;
CChannelEvent * evt = ChannelListEvents[channel_id];
t_channel_id epg_id = channel_id;
CZapitChannel * ch = CServiceManager::getInstance()->FindChannel(channel_id);
if (ch)
epg_id = ch->getEpgID();
CChannelEvent * evt = ChannelListEvents[epg_id];
if (evt) if (evt)
event = *evt; event = *evt;
} }

4
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -524,7 +524,9 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
else if (event.eventID) else if (event.eventID)
{ {
bool has_current_next = true; bool has_current_next = true;
CEitManager::getInstance()->getCurrentNextServiceKey(channel->getChannelID(), currentNextInfo); t_channel_id epg_id = channel->getChannelID();
epg_id = channel->getEpgID();
CEitManager::getInstance()->getCurrentNextServiceKey(epg_id, currentNextInfo);
timestr = timeString(event.startTime); timestr = timeString(event.startTime);
CShortEPGData epg; CShortEPGData epg;