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

Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup

Browse Source
This commit is contained in:
[CST] Bas
2012-03-06 12:51:31 +08:00
parent a4ff0a99fe 289bf2c4b2
commit 2142970a35
101 changed files with 15114 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/timerd/timermanager.cpp
View File

@@ -56,6 +56,9 @@ bool timer_is_rec;
bool timer_wakeup;
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()
{
@@ -1141,11 +1144,11 @@ CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time,
eventInfo.channel_id = channel_id;
eventInfo.apids = apids;
recordingDir = recDir;
CSectionsdClient sdc;
epgTitle="";
CShortEPGData epgdata;
if (sdc.getEPGidShort(epgID, &epgdata))
if (sectionsd_getEPGidShort(epgID, &epgdata))
epgTitle=epgdata.title;
}
//------------------------------------------------------------
CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId):
@@ -1250,8 +1253,9 @@ void CTimerEvent_Record::Reschedule()
//------------------------------------------------------------
void CTimerEvent_Record::getEpgId()
{
CSectionsdClient sdc;
CChannelEventList evtlist = sdc.getEventsServiceKey(eventInfo.channel_id &0xFFFFFFFFFFFFULL);
//TODO: Record/Zapto getEpgId code almost identical !
CChannelEventList evtlist;
sectionsd_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 )
@@ -1266,7 +1270,7 @@ void CTimerEvent_Record::getEpgId()
if(eventInfo.epgID != 0)
{
CShortEPGData epgdata;
if (sdc.getEPGidShort(eventInfo.epgID, &epgdata))
if (sectionsd_getEPGidShort(eventInfo.epgID, &epgdata))
epgTitle=epgdata.title;
}
}
@@ -1297,8 +1301,9 @@ void CTimerEvent_Zapto::fireEvent()
//------------------------------------------------------------
void CTimerEvent_Zapto::getEpgId()
{
CSectionsdClient sdc;
CChannelEventList evtlist = sdc.getEventsServiceKey(eventInfo.channel_id &0xFFFFFFFFFFFFULL);
//TODO: Record/Zapto getEpgId code almost identical !
CChannelEventList evtlist;
sectionsd_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 )
@@ -1313,8 +1318,8 @@ void CTimerEvent_Zapto::getEpgId()
if(eventInfo.epgID != 0)
{
CShortEPGData epgdata;
if (sdc.getEPGidShort(eventInfo.epgID, &epgdata))
epgTitle=epgdata.title;
if (sectionsd_getEPGidShort(eventInfo.epgID, &epgdata))
epgTitle=epgdata.title;
}
}
//=============================================================