From 888ca079c4451f64fc44b8b5c67ea46f5b0ffccf Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 1 Aug 2019 15:42:23 +0200 Subject: [PATCH] yweb: add url to StreamInfo Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/db17cc79b45210eb3061f1a6aa0a62533ae4072c Author: Jacek Jendrzej Date: 2019-08-01 (Thu, 01 Aug 2019) --- data/y-web/Y_StreamInfo.yhtm | 5 +++++ data/y-web/languages/Czech | 1 + data/y-web/languages/English | 1 + data/y-web/languages/Polski | 1 + data/y-web/languages/Slovak | 1 + src/nhttpd/tuxboxapi/neutrinoyparser.cpp | 1 + 6 files changed, 10 insertions(+) diff --git a/data/y-web/Y_StreamInfo.yhtm b/data/y-web/Y_StreamInfo.yhtm index 944651899..17145ae07 100644 --- a/data/y-web/Y_StreamInfo.yhtm +++ b/data/y-web/Y_StreamInfo.yhtm @@ -25,6 +25,11 @@
{=L:epg.si.streaminfo=} ({=ServiceName=})
+ + + + + diff --git a/data/y-web/languages/Czech b/data/y-web/languages/Czech index 8eace700f..53670179b 100644 --- a/data/y-web/languages/Czech +++ b/data/y-web/languages/Czech @@ -204,6 +204,7 @@ epg.si.pcrpid=Program Clock Reference PID epg.si.apid=Zvukový PID epg.si.vtxtpid=TeleText PID epg.si.crypt=Kodovací systém +epg.si.url=Url ======= Nastavení set.reload_neutrino=Restart Neutrina diff --git a/data/y-web/languages/English b/data/y-web/languages/English index 21e80fa0d..d0c84665c 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -226,6 +226,7 @@ epg.si.pcrpid=Program Clock Reference PID epg.si.apid=Audio PID epg.si.vtxtpid=Teletext PID epg.si.crypt=Crypt systems +epg.si.url=Url ========Settings set.reload_neutrino=reload Neutrino diff --git a/data/y-web/languages/Polski b/data/y-web/languages/Polski index 7588b3cfc..a3db1e5b2 100644 --- a/data/y-web/languages/Polski +++ b/data/y-web/languages/Polski @@ -206,6 +206,7 @@ epg.si.pcrpid=Program zegara odniesienia PID epg.si.apid=audio PID epg.si.vtxtpid=Telegazeta PID epg.si.crypt=system kodowania +epg.si.url=Url # ========= Ustawienia set.reload_neutrino=Restart Neutrino diff --git a/data/y-web/languages/Slovak b/data/y-web/languages/Slovak index c2fae22b3..1c82fbf19 100644 --- a/data/y-web/languages/Slovak +++ b/data/y-web/languages/Slovak @@ -225,6 +225,7 @@ epg.si.pcrpid=Program Clock Reference PID epg.si.apid=Zvukový PID epg.si.vtxtpid=TeleText PID epg.si.crypt=Kodovací systém +epg.si.url=Url ======= Nastavenia set.reload_neutrino=reŠtart Neutrina diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp index f784d2b1a..9b6c87ec4 100644 --- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp @@ -889,6 +889,7 @@ std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, s hh->ParamList["tsfrequency"] = string_printf("%d.%d MHz", serviceinfo.tsfrequency/1000, serviceinfo.tsfrequency%1000); hh->ParamList["polarisation"] = serviceinfo.polarisation==1?"h":"v"; hh->ParamList["ServiceName"] = NeutrinoAPI->GetServiceName(CZapit::getInstance()->GetCurrentChannelID()); + hh->ParamList["Url"] = CZapit::getInstance()->GetCurrentChannel()->getUrl().c_str(); hh->ParamList["VideoFormat"] = NeutrinoAPI->getVideoResolutionAsString(); // hh->ParamList["BitRate"] = NeutrinoAPI->getVideoFramerateAsString(); hh->ParamList["AspectRatio"] = NeutrinoAPI->getVideoAspectRatioAsString();
{=L:epg.si.url=}: 
{=Url=}
{=L:epg.si.resolution=}: