From 8d417bfe445d944db66376ed0cd52c9fd2661b4a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 7 Oct 2022 21:02:30 +0200 Subject: [PATCH] fix build after cherry-pick Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e2b2a60dd10eefc425522bbacd2ae8b8690431d9 Author: vanhofen Date: 2022-10-07 (Fri, 07 Oct 2022) Origin message was: ------------------ - fix build after cherry-pick ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/tuxboxapi/controlapi.cpp | 7 ++++--- src/nhttpd/tuxboxapi/controlapi.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 0585878d4..37c606fd0 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -271,6 +271,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]= {"xmltvlist", &CControlAPI::xmltvlistCGI, "text/plain"}, // utils {"build_live_url", &CControlAPI::build_live_url, ""}, + {"build_playlist", &CControlAPI::build_playlist, ""}, {"get_logo", &CControlAPI::logoCGI, "text/plain"}, // settings {"config", &CControlAPI::ConfigCGI, "text/plain"}, @@ -3413,7 +3414,7 @@ void CControlAPI::xmltvm3uCGI(CyhookHandler *hh) if (url.rfind(":") != 4) url = url.substr(0, url.rfind(":")); // strip off optional custom port url += ":"; - url += std::to_string(g_settings.streaming_port); + url += to_string(g_settings.streaming_port); url += "/id="; for (unsigned int i = 0; i < g_bouquetManager->Bouquets.size(); i++) @@ -3538,7 +3539,7 @@ void CControlAPI::build_live_url(CyhookHandler *hh) url = url.substr(0, url.rfind(":")); url += ":"; - url += std::to_string(g_settings.streaming_port); + url += to_string(g_settings.streaming_port); url += "/id="; // response url @@ -3579,7 +3580,7 @@ void CControlAPI::build_playlist(CyhookHandler *hh) url = url.substr(0, url.rfind(":")); url += ":"; - url += std::to_string(g_settings.streaming_port); + url += to_string(g_settings.streaming_port); url += "/id="; if(!hh->ParamList["id"].empty()) { diff --git a/src/nhttpd/tuxboxapi/controlapi.h b/src/nhttpd/tuxboxapi/controlapi.h index 86a50fc64..1325aa657 100644 --- a/src/nhttpd/tuxboxapi/controlapi.h +++ b/src/nhttpd/tuxboxapi/controlapi.h @@ -132,6 +132,7 @@ private: void xmltvm3uCGI(CyhookHandler *hh); void xmltvlistCGI(CyhookHandler *hh); void build_live_url(CyhookHandler *hh); + void build_playlist(CyhookHandler *hh); void logoCGI(CyhookHandler *hh); void ConfigCGI(CyhookHandler *hh); void FileCGI(CyhookHandler *hh);