From 54a6733afb62c10b313a3a4b24f14a8544feee7f Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 9 Sep 2018 13:06:05 +0200 Subject: [PATCH] fix logo url, white space in xmltv.m3u Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2ca0e70a57e1d54cec1ca7db0a3d6aedc10c55ab Author: TangoCash Date: 2018-09-09 (Sun, 09 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/nhttpd/tuxboxapi/controlapi.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 1838cd14d..5467c2c17 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -3316,6 +3316,8 @@ void CControlAPI::xmltvm3uCGI(CyhookHandler *hh) url = "http://"+hh->ParamList["host"]; else url = "http://"+hh->HeaderList["Host"]; + + std::string lurl = url; /* strip off optional custom port */ if (url.rfind(":") != 4) url = url.substr(0, url.rfind(":")); @@ -3338,7 +3340,7 @@ void CControlAPI::xmltvm3uCGI(CyhookHandler *hh) CZapitChannel * channel = chanlist[j]; std::string bouq_name = g_bouquetManager->Bouquets[i]->bName; std::string chan_id_short = string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID() & 0xFFFFFFFFFFFFULL); - result += "#EXTINF:-1 tvg-id=\""+chan_id_short+"\" tvg-logo=\""+NeutrinoAPI->getLogoFile(channel->getChannelID())+"\" group-title=\""+bouq_name+"\", "+channel->getName()+"\n"; + result += "#EXTINF:-1 tvg-id=\""+chan_id_short+"\" tvg-logo=\""+lurl+NeutrinoAPI->getLogoFile(channel->getChannelID())+"\" group-title=\""+bouq_name+"\","+channel->getName()+"\n"; result += url+string_printf(PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS, channel->getChannelID())+"\n"; } }