mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

- control/epgsearch: use outSingle instead of direct WriteLn

Browse Source
This commit is contained in:
svenhoefer
2016-02-22 23:53:37 +01:00
parent 922cc72abf
commit 3fd3f2ba1f
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1567,38 +1567,32 @@ void CControlAPI::SendFoundEvents(CyhookHandler *hh, bool xml_format)
snprintf(tmpstr, sizeof(tmpstr)," [%d min]",eventIterator->duration / 60); snprintf(tmpstr, sizeof(tmpstr)," [%d min]",eventIterator->duration / 60);
datetimer_str += tmpstr; datetimer_str += tmpstr;
hh->WriteLn(datetimer_str); result += hh->outSingle(datetimer_str);
hh->WriteLn(NeutrinoAPI->GetServiceName(eventIterator->channelID)); result += hh->outSingle(NeutrinoAPI->GetServiceName(eventIterator->channelID));
hh->WriteLn(epg.title); result += hh->outSingle(epg.title);
if (return_epginfo) { if (return_epginfo) {
if(!epg.info1.empty()) if(!epg.info1.empty())
hh->WriteLn(epg.info1); result += hh->outSingle(epg.info1);
if(!epg.info2.empty()) if(!epg.info2.empty())
hh->WriteLn(epg.info2); result += hh->outSingle(epg.info2);
} }
if (CEitManager::getInstance()->getEPGid(eventIterator->eventID, eventIterator->startTime, &longepg)) { if (CEitManager::getInstance()->getEPGid(eventIterator->eventID, eventIterator->startTime, &longepg)) {
hh->printf("fsk:%u\n", longepg.fsk); result += hh->outSingle(string_printf("fsk:%u", longepg.fsk));
genre = "";
#ifdef FULL_CONTENT_CLASSIFICATION #ifdef FULL_CONTENT_CLASSIFICATION
if (!longepg.contentClassification.empty()){ if (!longepg.contentClassification.empty())
genre = GetGenre(longepg.contentClassification[0]); genre = GetGenre(longepg.contentClassification[0]);
genre = ZapitTools::UTF8_to_UTF8XML(genre.c_str());
hh->WriteLn(genre);
}
#else #else
if (longepg.contentClassification) { if (longepg.contentClassification)
genre = GetGenre(longepg.contentClassification); genre = GetGenre(longepg.contentClassification);
genre = ZapitTools::UTF8_to_UTF8XML(genre.c_str());
hh->WriteLn(genre);
}
#endif #endif
if(!genre.empty())
result += hh->outSingle(ZapitTools::UTF8_to_UTF8XML(genre.c_str()));
} }
hh->WriteLn("----------------------------------------------------------"); result += hh->outSingle("----------------------------------------------------------");
} }
} }
} }
if (hh->outType == plain)
return;
result = hh->outArray("epgsearch", result); result = hh->outArray("epgsearch", result);
hh->SendResult(result); hh->SendResult(result);