mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

remotetimers: switch from full channelid to short channelid

Browse Source 
Signed-off-by: GetAway <get-away@t-online.de>
This commit is contained in:
TangoCash
2019-12-31 15:57:01 +01:00
committed by GetAway
parent ec780d8401
commit 6df729b954
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/timerlist.cpp
View File

@@ -795,7 +795,7 @@ bool CTimerList::RemoteBoxChanExists(t_channel_id channel_id)
bool CTimerList::LocalBoxChanExists(t_channel_id channel_id) bool CTimerList::LocalBoxChanExists(t_channel_id channel_id)
{ {
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(channel_id);
if (channel) if (channel)
return true; return true;
else else
@@ -884,6 +884,9 @@ void CTimerList::RemoteBoxTimerList(CTimerd::TimerList &rtimerlist)
rtimer.epg_starttime = (time_t) atoll(remotetimers[i]["start"][0].get("digits","").asString().c_str()); rtimer.epg_starttime = (time_t) atoll(remotetimers[i]["start"][0].get("digits","").asString().c_str());
sscanf(remotetimers[i].get("epg_id","").asString().c_str(), SCANF_CHANNEL_ID_TYPE, &rtimer.epg_id); 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); sscanf(remotetimers[i].get("channel_id","").asString().c_str(), SCANF_CHANNEL_ID_TYPE, &rtimer.channel_id);
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(rtimer.channel_id);
if(channel)
rtimer.channel_id = channel->getChannelID();
strncpy(rtimer.epgTitle,remotetimers[i].get("title","").asString().c_str(),sizeof(rtimer.epgTitle)); strncpy(rtimer.epgTitle,remotetimers[i].get("title","").asString().c_str(),sizeof(rtimer.epgTitle));
rtimer.epgTitle[sizeof(rtimer.epgTitle) - 1] = 0; rtimer.epgTitle[sizeof(rtimer.epgTitle) - 1] = 0;
if (remotetimers[i]["audio"].get("apids_conf","").asString() == "true") if (remotetimers[i]["audio"].get("apids_conf","").asString() == "true")

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

@@ -1510,7 +1510,7 @@ void CControlAPI::GetChannelCGI(CyhookHandler *hh)
if (channel_id != 0) if (channel_id != 0)
{ {
NeutrinoAPI->GetChannelEvents(); NeutrinoAPI->GetChannelEvents();
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(channel_id); CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(channel_id);
if (channel) if (channel)
{ {
result = _GetBouquetWriteItem(hh, channel, -1, -1); result = _GetBouquetWriteItem(hh, channel, -1, -1);
@@ -3009,6 +3009,10 @@ void CControlAPI::doNewTimer(CyhookHandler *hh)
else else
eventinfo.channel_id = NeutrinoAPI->ChannelNameToChannelId(hh->ParamList["channel_name"]); eventinfo.channel_id = NeutrinoAPI->ChannelNameToChannelId(hh->ParamList["channel_name"]);
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(eventinfo.channel_id);
if(channel)
eventinfo.channel_id = channel->getChannelID();
std::string _rec_dir = hh->ParamList["rec_dir"]; std::string _rec_dir = hh->ParamList["rec_dir"];
void *data=NULL; void *data=NULL;
if(type == CTimerd::TIMER_RECORD) if(type == CTimerd::TIMER_RECORD)