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

use CEitManager to get EIT data

Browse Source
This commit is contained in:
[CST] Focus
2012-08-30 11:40:02 +04:00
parent 6c9a949c69
commit 74a761ef50
15 changed files with 76 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/timerd/timermanager.cpp
View File

@@ -33,6 +33,7 @@
#include <timerdclient/timerdclient.h>
#include <timerdclient/timerdmsg.h>
#include <sectionsdclient/sectionsdclient.h>
#include <eitd/sectionsd.h>
#include <vector>
#include <cstdlib>
@@ -46,9 +47,6 @@ time_t timer_minutes;
bool timer_is_rec;
static pthread_mutex_t tm_eventsMutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
void sectionsd_getEventsServiceKey(t_channel_id serviceUniqueKey, CChannelEventList &eList, char search = 0, std::string search_text = "");
bool sectionsd_getEPGidShort(event_id_t epgID, CShortEPGData * epgdata);
//------------------------------------------------------------
CTimerManager::CTimerManager()
{
@@ -1113,7 +1111,7 @@ CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time,
recordingDir = recDir;
epgTitle="";
CShortEPGData epgdata;
if (sectionsd_getEPGidShort(epgID, &epgdata))
if (CEitManager::getInstance()->getEPGidShort(epgID, &epgdata))
epgTitle=epgdata.title;
}
@@ -1222,7 +1220,7 @@ void CTimerEvent_Record::getEpgId()
{
//TODO: Record/Zapto getEpgId code almost identical !
CChannelEventList evtlist;
sectionsd_getEventsServiceKey(eventInfo.channel_id &0xFFFFFFFFFFFFULL, evtlist);
CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id &0xFFFFFFFFFFFFULL, evtlist);
// we check for a time in the middle of the recording
time_t check_time=alarmTime/2 + stopTime/2;
for ( CChannelEventList::iterator e= evtlist.begin(); e != evtlist.end(); ++e )
@@ -1237,7 +1235,7 @@ void CTimerEvent_Record::getEpgId()
if(eventInfo.epgID != 0)
{
CShortEPGData epgdata;
if (sectionsd_getEPGidShort(eventInfo.epgID, &epgdata))
if (CEitManager::getInstance()->getEPGidShort(eventInfo.epgID, &epgdata))
epgTitle=epgdata.title;
}
}
@@ -1270,7 +1268,7 @@ void CTimerEvent_Zapto::getEpgId()
{
//TODO: Record/Zapto getEpgId code almost identical !
CChannelEventList evtlist;
sectionsd_getEventsServiceKey(eventInfo.channel_id &0xFFFFFFFFFFFFULL, evtlist);
CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id &0xFFFFFFFFFFFFULL, evtlist);
// we check for a time 5 min after zap
time_t check_time=alarmTime + 300;
for ( CChannelEventList::iterator e= evtlist.begin(); e != evtlist.end(); ++e )
@@ -1285,7 +1283,7 @@ void CTimerEvent_Zapto::getEpgId()
if(eventInfo.epgID != 0)
{
CShortEPGData epgdata;
if (sectionsd_getEPGidShort(eventInfo.epgID, &epgdata))
if (CEitManager::getInstance()->getEPGidShort(eventInfo.epgID, &epgdata))
epgTitle=epgdata.title;
}
}