From 4475cde71abd1baac4a9c4b2bddaadec9c46a88c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 20 Feb 2016 20:56:15 +0100 Subject: [PATCH] controlapi: rename EpgSearchTXTCGI -> EpgSearchCGI Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e765ab983be070b66f0f8138e8c2faca95903fa7 Author: vanhofen Date: 2016-02-20 (Sat, 20 Feb 2016) Origin message was: ------------------ - controlapi: rename EpgSearchTXTCGI -> EpgSearchCGI ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/tuxboxapi/controlapi.cpp | 4 ++-- src/nhttpd/tuxboxapi/controlapi.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 655023b1c..3f86a22d0 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -167,7 +167,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]= {"getmode", &CControlAPI::GetModeCGI, "text/plain"}, {"setmode", &CControlAPI::SetModeCGI, "text/plain"}, {"epgsearchxml", &CControlAPI::EpgSearchXMLCGI, ""}, - {"epgsearch", &CControlAPI::EpgSearchTXTCGI, ""}, + {"epgsearch", &CControlAPI::EpgSearchCGI, ""}, {"epg", &CControlAPI::EpgCGI, ""}, {"zapto", &CControlAPI::ZaptoCGI, "text/plain"}, {"signal", &CControlAPI::SignalInfoCGI, "text/plain"}, @@ -1433,7 +1433,7 @@ void CControlAPI::EpgSearchXMLCGI(CyhookHandler *hh) */ //------------------------------------------------------------------------- -void CControlAPI::EpgSearchTXTCGI(CyhookHandler *hh) +void CControlAPI::EpgSearchCGI(CyhookHandler *hh) { SendFoundEvents(hh); } diff --git a/src/nhttpd/tuxboxapi/controlapi.h b/src/nhttpd/tuxboxapi/controlapi.h index 1ba5dab7c..8b635dd9e 100644 --- a/src/nhttpd/tuxboxapi/controlapi.h +++ b/src/nhttpd/tuxboxapi/controlapi.h @@ -55,8 +55,7 @@ private: void SendTimersXML(CyhookHandler *hh); void epgDetailList(CyhookHandler *hh); void EpgSearchXMLCGI(CyhookHandler *hh); - void EpgSearchTXTCGI(CyhookHandler *hh); - void EpgSearchCGI(CyhookHandler *hh, bool xml_format = false); + void EpgSearchCGI(CyhookHandler *hh); // subs friend class CNeutrinoWebserver; // for timer /fb/ compatibility void doModifyTimer(CyhookHandler *hh);