mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +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

8
src/nhttpd/tuxboxapi/controlapi.cpp
View File

@@ -2662,9 +2662,9 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
// epg title
std::string title = timer->epgTitle;
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))
title = epgdata.title;
}
@@ -2720,7 +2720,7 @@ void CControlAPI::SendTimers(CyhookHandler *hh)
timer_item += hh->outObject("audio", audio, true);
timer_item += hh->outPair("recording_dir", timer->recordingDir, true);
timer_item += hh->outPair("epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->epgID), false);
timer_item += hh->outPair("epg_id", string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, timer->epg_id), false);
}
break;
@@ -2983,7 +2983,7 @@ void CControlAPI::doNewTimer(CyhookHandler *hh)
CTimerd::RecordingInfo recinfo;
CTimerd::EventInfo eventinfo;
eventinfo.epgID = 0;
eventinfo.epg_id = 0;
eventinfo.epg_starttime = 0;
eventinfo.apids = TIMERD_APIDS_CONF;
eventinfo.recordingSafety = (hh->ParamList["rs"] == "1") || (hh->ParamList["rs"] == "on");

4
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -970,10 +970,10 @@ std::string CNeutrinoYParser::func_get_timer_list(CyhookHandler *, std::string
}
sAddData += ')';
}
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))
sAddData+="<br/>" + epgdata.title;
else
sAddData+=std::string("<br/>")+timer->epgTitle;