mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- adzap: move code to determinate monitorLifeTime to own function

Browse Source
This commit is contained in:
svenhoefer
2016-02-28 23:08:52 +01:00
parent a5bc5093e7
commit 527f11d4de
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/adzap.cpp
View File

@@ -84,25 +84,32 @@ void CAdZapMenu::Init()
CChannelList *channelList = CNeutrinoApp::getInstance()->channelList; CChannelList *channelList = CNeutrinoApp::getInstance()->channelList;
channelId = channelList ? channelList->getActiveChannel_ChannelID() : -1; channelId = channelList ? channelList->getActiveChannel_ChannelID() : -1;
channelName = channelList->getActiveChannelName(); channelName = channelList->getActiveChannelName();
CChannelEventList evtlist; evtlist.clear();
CEitManager::getInstance()->getEventsServiceKey(channelId & 0xFFFFFFFFFFFFULL, evtlist); CEitManager::getInstance()->getEventsServiceKey(channelId & 0xFFFFFFFFFFFFULL, evtlist);
monitorLifeTime.tv_sec = 0; monitorLifeTime.tv_sec = 0;
if (!evtlist.empty()) if (!evtlist.empty())
{ {
sort(evtlist.begin(), evtlist.end(), sortByDateTime); sort(evtlist.begin(), evtlist.end(), sortByDateTime);
CChannelEventList::iterator eli; monitorLifeTime.tv_sec = getMonitorLifeTime();
struct timespec ts; Update();
clock_gettime(CLOCK_REALTIME, &ts);
for (eli = evtlist.begin(); eli != evtlist.end(); ++eli)
{
if ((u_int) eli->startTime + (u_int) eli->duration > (u_int) ts.tv_sec)
{
monitorLifeTime.tv_sec = (uint) eli->startTime + eli->duration;
Update();
break;
}
}
} }
printf("CAdZapMenu::%s: monitorLifeTime.tv_sec: %d\n", __func__, (uint) monitorLifeTime.tv_sec);
}
time_t CAdZapMenu::getMonitorLifeTime()
{
if (evtlist.empty())
return 0;
CChannelEventList::iterator eli;
struct timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
for (eli = evtlist.begin(); eli != evtlist.end(); ++eli)
{
if ((u_int) eli->startTime + (u_int) eli->duration > (u_int) ts.tv_sec)
return (uint) eli->startTime + eli->duration;
}
return 0;
} }
void CAdZapMenu::Update() void CAdZapMenu::Update()

2
src/gui/adzap.h
View File

@@ -43,11 +43,13 @@ class CAdZapMenu: public CMenuTarget
struct timespec zapBackTime; struct timespec zapBackTime;
std::string channelName; std::string channelName;
CMenuForwarder *forwarders[9]; CMenuForwarder *forwarders[9];
CChannelEventList evtlist;
struct timespec monitorLifeTime; struct timespec monitorLifeTime;
t_channel_id channelId; t_channel_id channelId;
sem_t sem; sem_t sem;
CAdZapMenu(); CAdZapMenu();
void Init(); void Init();
time_t getMonitorLifeTime();
void Settings(); void Settings();
void Update(); void Update();
void Run(void); void Run(void);