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

cosmetics: align epg_id notation to channel_id

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4343c2d5da
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-27 (Sat, 27 Apr 2019)

Origin message was:
------------------
- cosmetics: align epg_id notation to channel_id

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-04-27 16:26:21 +02:00
parent 9e4b2f9383
commit 23b553a97e
24 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/timerdclient/timerdclient.cpp
View File

@@ -266,7 +266,7 @@ bool CTimerdClient::checkDouble(CTimerd::CTimerEventTypes evType, void* data, ti
CTimerd::EventInfo *ei=static_cast<CTimerd::EventInfo*>(data);
if( ei->channel_id == it->channel_id )
{
if(( ei->epgID != 0 && ei->epgID != it->epgID ) || ( ei->epg_starttime != 0 && it->epg_starttime != ei->epg_starttime) )
if(( ei->epg_id != 0 && ei->epg_id != it->epg_id ) || ( ei->epg_starttime != 0 && it->epg_starttime != ei->epg_starttime) )
{
return false;//not double
}
@@ -278,7 +278,7 @@ bool CTimerdClient::checkDouble(CTimerd::CTimerEventTypes evType, void* data, ti
CTimerd::RecordingInfo *ri=static_cast<CTimerd::RecordingInfo*>(data);
if(ri->channel_id == it->channel_id && ri->apids == it->apids && !strncmp(ri->recordingDir, it->recordingDir, RECORD_DIR_MAXLEN-1) )
{
if( ( ri->epgID != 0 && ri->epgID != it->epgID ) || ( ri->epg_starttime != 0 && it->epg_starttime != ri->epg_starttime) )
if( ( ri->epg_id != 0 && ri->epg_id != it->epg_id ) || ( ri->epg_starttime != 0 && it->epg_starttime != ri->epg_starttime) )
{
return false;//not double
}
@@ -332,7 +332,7 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
tei.apids = ei->apids;
tei.channel_id = ei->channel_id;
tei.epg_starttime = ei->epg_starttime;
tei.epgID = ei->epgID;
tei.epg_id = ei->epg_id;
tei.recordingSafety = ei->recordingSafety;
length = sizeof( CTimerd::TransferEventInfo);
data = &tei;
@@ -343,7 +343,7 @@ int CTimerdClient::addTimerEvent( CTimerd::CTimerEventTypes evType, void* data,
tri.apids = ri->apids;
tri.channel_id = ri->channel_id;
tri.epg_starttime = ri->epg_starttime;
tri.epgID = ri->epgID;
tri.epg_id = ri->epg_id;
tri.recordingSafety = ri->recordingSafety;
tri.autoAdjustToEPG = ri->autoAdjustToEPG;
tri.channel_ci = ri->channel_ci; //NI

12
lib/timerdclient/timerdclient.h
View File

@@ -110,12 +110,12 @@ class CTimerdClient:private CBasicClient
// adds new record timer event
int addRecordTimerEvent(const t_channel_id channel_id, time_t alarmtime, time_t stoptime,
uint64_t epgID=0, time_t epg_starttime=0, time_t announcetime = 0,
uint64_t epg_id=0, time_t epg_starttime=0, time_t announcetime = 0,
unsigned char apids=TIMERD_APIDS_STD, bool safety=false,bool autoAdjust=false, std::string recDir="", bool forceAdd=true, bool channel_ci=false, CTimerd::CTimerEventRepeat evrepeat = CTimerd::TIMERREPEAT_ONCE, uint32_t repeatcount = 0)
{
CTimerd::RecordingInfo eventInfo;
eventInfo.channel_id = channel_id;
eventInfo.epgID = epgID;
eventInfo.epg_id = epg_id;
eventInfo.epg_starttime = epg_starttime;
eventInfo.apids = apids;
eventInfo.recordingSafety = safety;
@@ -126,11 +126,11 @@ class CTimerdClient:private CBasicClient
};
int addImmediateRecordTimerEvent(const t_channel_id channel_id, time_t alarmtime, time_t stoptime,
uint64_t epgID=0, time_t epg_starttime=0,unsigned char apids=TIMERD_APIDS_STD)
uint64_t epg_id=0, time_t epg_starttime=0,unsigned char apids=TIMERD_APIDS_STD)
{
CTimerd::EventInfo eventInfo;
eventInfo.channel_id = channel_id;
eventInfo.epgID = epgID;
eventInfo.epg_id = epg_id;
eventInfo.epg_starttime = epg_starttime;
eventInfo.apids = apids;
eventInfo.recordingSafety = false;
@@ -144,12 +144,12 @@ class CTimerdClient:private CBasicClient
// adds new zapto timer event
int addZaptoTimerEvent(const t_channel_id channel_id, time_t alarmtime, time_t announcetime = 0,
time_t stoptime = 0, uint64_t epgID=0, time_t epg_starttime=0,
time_t stoptime = 0, uint64_t epg_id=0, time_t epg_starttime=0,
unsigned char apids=TIMERD_APIDS_STD)
{
CTimerd::EventInfo eventInfo;
eventInfo.channel_id = channel_id;
eventInfo.epgID = epgID;
eventInfo.epg_id = epg_id;
eventInfo.epg_starttime = epg_starttime;
eventInfo.apids = apids;
eventInfo.recordingSafety = false;

10
lib/timerdclient/timerdtypes.h
View File

@@ -83,7 +83,7 @@ class CTimerd
struct EventInfo
{
event_id_t epgID;
t_event_id epg_id;
time_t epg_starttime;
t_channel_id channel_id;
unsigned char apids;
@@ -94,7 +94,7 @@ class CTimerd
struct TransferEventInfo
{
event_id_t epgID;
t_event_id epg_id;
time_t epg_starttime;
t_channel_id channel_id;
unsigned char apids;
@@ -118,7 +118,7 @@ class CTimerd
{
apids = e.apids;
channel_id = e.channel_id;
epgID = e.epgID;
epg_id = e.epg_id;
epg_starttime = e.epg_starttime;
recordingSafety = e.recordingSafety;
autoAdjustToEPG = e.autoAdjustToEPG;
@@ -128,7 +128,7 @@ class CTimerd
{
apids = e.apids;
channel_id = e.channel_id;
epgID = e.epgID;
epg_id = e.epg_id;
epg_starttime = e.epg_starttime;
recordingSafety = e.recordingSafety;
autoAdjustToEPG = e.autoAdjustToEPG;
@@ -158,7 +158,7 @@ class CTimerd
time_t announceTime;
time_t stopTime;
t_channel_id channel_id; //only filled if applicable
event_id_t epgID; //only filled if applicable
t_event_id epg_id; //only filled if applicable
time_t epg_starttime; //only filled if applicable
unsigned char apids; //only filled if applicable
bool standby_on; //only filled if applicable