mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 07:22:57 +02:00
cosmetics: align epg_id notation to channel_id
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:
@@ -2678,9 +2678,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;
|
||||
}
|
||||
|
||||
@@ -2736,7 +2736,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;
|
||||
|
||||
@@ -2999,7 +2999,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");
|
||||
|
Reference in New Issue
Block a user