mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +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

26
lib/sectionsdclient/sectionsdclient.cpp
View File

@@ -242,7 +242,7 @@ void CSectionsdClient::dumpStatus()
}
#if 0
bool CSectionsdClient::getComponentTagsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::ComponentTagList& tags)
bool CSectionsdClient::getComponentTagsUniqueKey(const t_event_id uniqueKey, CSectionsdClient::ComponentTagList& tags)
{
if (send(sectionsd::ComponentTagsUniqueKey, (char*)&uniqueKey, sizeof(uniqueKey)))
{
@@ -283,7 +283,7 @@ bool CSectionsdClient::getComponentTagsUniqueKey(const event_id_t uniqueKey, CSe
}
}
bool CSectionsdClient::getLinkageDescriptorsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::LinkageDescriptorList& descriptors)
bool CSectionsdClient::getLinkageDescriptorsUniqueKey(const t_event_id uniqueKey, CSectionsdClient::LinkageDescriptorList& descriptors)
{
if (send(sectionsd::LinkageDescriptorsUniqueKey, (char*)&uniqueKey, sizeof(uniqueKey)))
{
@@ -368,16 +368,16 @@ bool CSectionsdClient::getCurrentNextServiceKey(const t_channel_id channel_id, C
char* dp = pData;
// current
current_next.current_uniqueKey = *((event_id_t *)dp);
dp+= sizeof(event_id_t);
current_next.current_uniqueKey = *((t_event_id *)dp);
dp+= sizeof(t_event_id);
current_next.current_zeit = *(CSectionsdClient::sectionsdTime*) dp;
dp+= sizeof(CSectionsdClient::sectionsdTime);
current_next.current_name = dp;
dp+=strlen(dp)+1;
// next
current_next.next_uniqueKey = *((event_id_t *)dp);
dp+= sizeof(event_id_t);
current_next.next_uniqueKey = *((t_event_id *)dp);
dp+= sizeof(t_event_id);
current_next.next_zeit = *(CSectionsdClient::sectionsdTime*) dp;
dp+= sizeof(CSectionsdClient::sectionsdTime);
current_next.next_name = dp;
@@ -419,7 +419,7 @@ CChannelEventList CSectionsdClient::getChannelEvents(const bool tv_mode, t_chann
{
CChannelEvent aEvent;
aEvent.eventID = *((event_id_t *) dp);
aEvent.eventID = *((t_event_id *) dp);
dp+=sizeof(aEvent.eventID);
aEvent.startTime = *((time_t *) dp);
@@ -486,7 +486,7 @@ bool CSectionsdClient::getEventsServiceKeySearchAdd(CChannelEventList& eList,con
{
CChannelEvent aEvent;
aEvent.eventID = *((event_id_t *) dp);
aEvent.eventID = *((t_event_id *) dp);
dp+=sizeof(aEvent.eventID);
aEvent.startTime = *((time_t *) dp);
@@ -532,7 +532,7 @@ CChannelEventList CSectionsdClient::getEventsServiceKey(const t_channel_id chann
{
CChannelEvent aEvent;
aEvent.eventID = *((event_id_t *) dp);
aEvent.eventID = *((t_event_id *) dp);
dp+=sizeof(aEvent.eventID);
aEvent.startTime = *((time_t *) dp);
@@ -654,7 +654,7 @@ bool CSectionsdClient::getActualEPGServiceKey(const t_channel_id channel_id, CEP
char* dp = pData;
epgdata->eventID = *((event_id_t *)dp);
epgdata->eventID = *((t_event_id *)dp);
dp+= sizeof(epgdata->eventID);
epgdata->title = dp;
@@ -692,7 +692,7 @@ bool CSectionsdClient::getActualEPGServiceKey(const t_channel_id channel_id, CEP
return false;
}
bool CSectionsdClient::getEPGid(const event_id_t eventid, const time_t starttime, CEPGData * epgdata)
bool CSectionsdClient::getEPGid(const t_event_id eventid, const time_t starttime, CEPGData * epgdata)
{
sectionsd::commandGetEPGid msg;
@@ -710,7 +710,7 @@ bool CSectionsdClient::getEPGid(const event_id_t eventid, const time_t starttime
char* dp = pData;
epgdata->eventID = *((event_id_t *)dp);
epgdata->eventID = *((t_event_id *)dp);
dp+= sizeof(epgdata->eventID);
epgdata->title = dp;
@@ -747,7 +747,7 @@ bool CSectionsdClient::getEPGid(const event_id_t eventid, const time_t starttime
return false;
}
bool CSectionsdClient::getEPGidShort(const event_id_t eventid, CShortEPGData * epgdata)
bool CSectionsdClient::getEPGidShort(const t_event_id eventid, CShortEPGData * epgdata)
{
if (send(sectionsd::epgEPGidShort, (char*)&eventid, sizeof(eventid)))
{

14
lib/sectionsdclient/sectionsdclient.h
View File

@@ -44,7 +44,7 @@ class CChannelEvent
{
public:
t_channel_id get_channel_id(void) const { return GET_CHANNEL_ID_FROM_EVENT_ID(eventID); }
event_id_t eventID;
t_event_id eventID;
std::string description;
std::string text;
time_t startTime;
@@ -139,11 +139,11 @@ class CSectionsdClient : private CBasicClient
struct responseGetCurrentNextInfoChannelID
{
event_id_t current_uniqueKey;
t_event_id current_uniqueKey;
CSectionsdClient::sectionsdTime current_zeit;
std::string current_name;
char current_fsk;
event_id_t next_uniqueKey;
t_event_id next_uniqueKey;
CSectionsdClient::sectionsdTime next_zeit;
std::string next_name;
unsigned flags;
@@ -176,16 +176,16 @@ class CSectionsdClient : private CBasicClient
} epg_config;
#if 0
bool getComponentTagsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::ComponentTagList& tags);
bool getLinkageDescriptorsUniqueKey(const event_id_t uniqueKey, CSectionsdClient::LinkageDescriptorList& descriptors);
bool getComponentTagsUniqueKey(const t_event_id uniqueKey, CSectionsdClient::ComponentTagList& tags);
bool getLinkageDescriptorsUniqueKey(const t_event_id uniqueKey, CSectionsdClient::LinkageDescriptorList& descriptors);
bool getNVODTimesServiceKey(const t_channel_id channel_id, CSectionsdClient::NVODTimesList& nvod_list);
bool getCurrentNextServiceKey(const t_channel_id channel_id, CSectionsdClient::responseGetCurrentNextInfoChannelID& current_next);
CChannelEventList getChannelEvents(const bool tv_mode = true, t_channel_id* = NULL, int size = 0);
CChannelEventList getEventsServiceKey(const t_channel_id channel_id);
bool getEventsServiceKeySearchAdd(CChannelEventList& evtlist,const t_channel_id channel_id,char m_search_typ,std::string& m_search_text);
bool getEPGid(const event_id_t eventid, const time_t starttime, CEPGData * epgdata);
bool getEPGid(const t_event_id eventid, const time_t starttime, CEPGData * epgdata);
bool getActualEPGServiceKey(const t_channel_id channel_id, CEPGData * epgdata);
bool getEPGidShort(const event_id_t eventid, CShortEPGData * epgdata);
bool getEPGidShort(const t_event_id eventid, CShortEPGData * epgdata);
void setPrivatePid(const unsigned short pid);
#endif

4
lib/sectionsdclient/sectionsdtypes.h
View File

@@ -26,8 +26,8 @@
#include <zapit/client/zapittypes.h> /* t_channel_id, t_service_id, t_original_network_id, t_transport_stream_id; */
typedef uint64_t event_id_t;
#define CREATE_EVENT_ID(channel_id,event_nr) ((((event_id_t)channel_id) << 16) | event_nr)
typedef uint64_t t_event_id;
#define CREATE_EVENT_ID(channel_id,event_nr) ((((t_event_id)channel_id) << 16) | event_nr)
#define GET_CHANNEL_ID_FROM_EVENT_ID(event_id) ((t_channel_id)((event_id) >> 16))
#endif /* __sectionsdtypes_h__ */

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