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

- cosmetics: align epg_id notation to channel_id

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-04-27 16:26:21 +02:00
committed by Thilo Graf
parent a5a3ec04cc
commit 08cdb2ee83
24 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/eventlist.cpp
View File

@@ -153,13 +153,13 @@ void CEventList::UpdateTimerList(void)
// Function: HasTimerConflicts
// search for timer conflicts for given time
// return: true if found any conflict, you can watch with parameter epg_ID
bool CEventList::HasTimerConflicts(time_t starttime, time_t duration, event_id_t *epg_ID)
bool CEventList::HasTimerConflicts(time_t starttime, time_t duration, t_event_id *epg_ID)
{
for(uint i= 0; i < timerlist.size(); i++)
{
if(timerlist[i].stopTime > starttime-timerPre && timerlist[i].alarmTime < starttime+duration+timerPost)
{
*epg_ID = timerlist[i].epgID;
*epg_ID = timerlist[i].epg_id;
return true;
}
}
@@ -707,7 +707,7 @@ CTimerd::CTimerEventTypes CEventList::isScheduled(t_channel_id channel_id, CChan
CTimerd::TimerList::iterator timer = timerlist.begin();
for(; timer != timerlist.end(); ++timer) {
if(timer->channel_id == channel_id && (timer->eventType == CTimerd::TIMER_ZAPTO || timer->eventType == CTimerd::TIMER_RECORD || timer->eventType == CTimerd::TIMER_REMOTEBOX)) {
if(timer->epgID == event->eventID) {
if(timer->epg_id == event->eventID) {
if(timer->epg_starttime == event->startTime) {
bool isTimeShiftTimer = false;
if( timer->eventType == CTimerd::TIMER_RECORD){

6
src/gui/eventlist.h
View File

@@ -72,7 +72,7 @@ class CEventList : public CListHelpers
t_bouquet_id m_search_bouquet_id;
bool m_showChannel;
int oldIndex;
event_id_t oldEventID;
t_event_id oldEventID;
bool findEvents(t_channel_id channel_id, std::string channelname);
@@ -99,7 +99,7 @@ class CEventList : public CListHelpers
std::string infozone_text;
bool infozone_background;
int sort_mode;
event_id_t item_event_ID;
t_event_id item_event_ID;
CComponentsText *infozone;
CComponentsHeader *header;
CProgressBar *pb;
@@ -119,7 +119,7 @@ class CEventList : public CListHelpers
int timerPre;
int timerPost;
void UpdateTimerList(void);
bool HasTimerConflicts(time_t starttime, time_t duration, event_id_t * epg_ID);
bool HasTimerConflicts(time_t starttime, time_t duration, t_event_id * epg_ID);
bool showfollow;
CTimerd::CTimerEventTypes isScheduled(t_channel_id channel_id, CChannelEvent * event, int * tID = NULL);

4
src/gui/followscreenings.h
View File

@@ -50,7 +50,7 @@ class CFollowScreenings : public CMenuTarget
time_t starttime;
time_t stoptime;
std::string title;
uint64_t epgID;
uint64_t epg_id;
unsigned char apids;
bool safety;
std::string recDir;
@@ -69,7 +69,7 @@ class CFollowScreenings : public CMenuTarget
this->channel_id = Channel_id;
this->starttime = Starttime;
this->stoptime = Stoptime;
this->epgID = EpgID;
this->epg_id = EpgID;
this->recDir = RecDir;
this->evtlist = Evtlist;
this->title = Title;

2
src/gui/infoviewer.cpp
View File

@@ -81,7 +81,7 @@ extern CBouquetList * bouquetList; /* neutrino.cpp */
extern CPictureViewer * g_PicViewer;
extern cVideo * videoDecoder;
event_id_t CInfoViewer::last_curr_id = 0, CInfoViewer::last_next_id = 0;
t_event_id CInfoViewer::last_curr_id = 0, CInfoViewer::last_next_id = 0;
static bool sortByDateTime (const CChannelEvent& a, const CChannelEvent& b)
{

2
src/gui/infoviewer.h
View File

@@ -94,7 +94,7 @@ class CInfoViewer
int header_height;
bool newfreq ;
static const short bar_width = 72;
static event_id_t last_curr_id, last_next_id;
static t_event_id last_curr_id, last_next_id;
uint64_t timeoutEnd;
void setInfobarTimeout(int timeout_ext = 0);

24
src/gui/timerlist.cpp
View File

@@ -560,7 +560,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
timerNew.announceTime=timerNew.alarmTime-60;
CTimerd::EventInfo eventinfo;
CTimerd::RecordingInfo recinfo;
eventinfo.epgID=0;
eventinfo.epg_id=0;
eventinfo.epg_starttime=0;
eventinfo.channel_id=timerNew.channel_id;
eventinfo.apids = TIMERD_APIDS_CONF;
@@ -578,7 +578,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
return menu_return::RETURN_REPAINT;
if (timerNew.eventType==CTimerd::TIMER_RECORD)
{
recinfo.epgID=0;
recinfo.epg_id=0;
recinfo.epg_starttime=0;
recinfo.channel_id=timerNew.channel_id;
recinfo.apids=TIMERD_APIDS_CONF;
@@ -878,7 +878,7 @@ void CTimerList::RemoteBoxTimerList(CTimerd::TimerList &rtimerlist)
rtimer.alarmTime = (time_t) atoll(remotetimers[i]["alarm"][0].get("digits","").asString().c_str());
rtimer.announceTime = (time_t) atoll(remotetimers[i]["announce"][0].get("digits","").asString().c_str());
rtimer.stopTime = (time_t) atoll(remotetimers[i]["stop"][0].get("digits","").asString().c_str());
sscanf(remotetimers[i].get("epg_id","").asString().c_str(), SCANF_CHANNEL_ID_TYPE, &rtimer.epgID);
sscanf(remotetimers[i].get("epg_id","").asString().c_str(), SCANF_CHANNEL_ID_TYPE, &rtimer.epg_id);
sscanf(remotetimers[i].get("channel_id","").asString().c_str(), SCANF_CHANNEL_ID_TYPE, &rtimer.channel_id);
strncpy(rtimer.epgTitle,remotetimers[i].get("title","").asString().c_str(),sizeof(rtimer.epgTitle));
rtimer.epgTitle[sizeof(rtimer.epgTitle) - 1] = 0;
@@ -1033,7 +1033,7 @@ int CTimerList::show()
std::string title = "";
char buf1[1024];
CEPGData epgdata;
CEitManager::getInstance()->getEPGid(timerlist[selected].epgID, timerlist[selected].epg_starttime, &epgdata);
CEitManager::getInstance()->getEPGid(timerlist[selected].epg_id, timerlist[selected].epg_starttime, &epgdata);
memset(buf1, '\0', sizeof(buf1));
if (!epgdata.title.empty())
title = "(" + epgdata.title + ")\n";
@@ -1086,9 +1086,9 @@ int CTimerList::show()
if (timer->eventType == CTimerd::TIMER_RECORD || timer->eventType == CTimerd::TIMER_REMOTEBOX || timer->eventType == CTimerd::TIMER_ZAPTO)
{
hide();
if (timer->epgID != 0)
if (timer->epg_id != 0)
{
res = g_EpgData->show(timer->channel_id, timer->epgID, &timer->epg_starttime);
res = g_EpgData->show(timer->channel_id, timer->epg_id, &timer->epg_starttime);
}
else
ShowHint(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NOTFOUND);
@@ -1301,10 +1301,10 @@ void CTimerList::paintItem(int pos)
}
zAddData += ')';
}
if (timer.epgID!=0)
if (timer.epg_id!=0)
{
CEPGData epgdata;
if (CEitManager::getInstance()->getEPGid(timer.epgID, timer.epg_starttime, &epgdata))
if (CEitManager::getInstance()->getEPGid(timer.epg_id, timer.epg_starttime, &epgdata))
{
zAddData += " : ";
zAddData += epgdata.title;
@@ -1895,10 +1895,10 @@ bool CTimerList::askUserOnRemoteTimerConflict(time_t announceTime, time_t stopTi
timerbuf += CTimerList::convertTimerType2String(it->eventType);
timerbuf += " (";
timerbuf += CTimerList::convertChannelId2String(it->channel_id); // UTF-8
if (it->epgID != 0)
if (it->epg_id != 0)
{
CEPGData epgdata;
if (CEitManager::getInstance()->getEPGid(it->epgID, it->epg_starttime, &epgdata))
if (CEitManager::getInstance()->getEPGid(it->epg_id, it->epg_starttime, &epgdata))
{
timerbuf += ":";
timerbuf += epgdata.title;
@@ -1947,10 +1947,10 @@ bool askUserOnTimerConflict(time_t announceTime, time_t stopTime, t_channel_id c
timerbuf += CTimerList::convertTimerType2String(it->eventType);
timerbuf += " (";
timerbuf += CTimerList::convertChannelId2String(it->channel_id); // UTF-8
if (it->epgID != 0)
if (it->epg_id != 0)
{
CEPGData epgdata;
if (CEitManager::getInstance()->getEPGid(it->epgID, it->epg_starttime, &epgdata))
if (CEitManager::getInstance()->getEPGid(it->epg_id, it->epg_starttime, &epgdata))
{
timerbuf += ":";
timerbuf += epgdata.title;