From 30108c154b24b86b05f73a76b9febdc0ff7f5563 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 6 Sep 2022 20:35:09 +0200 Subject: [PATCH] yWeb: small reworks in Y_StreamInfo.yhtm Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/74de1e6f28e204b45d2e1b2102ca98e85f626e34 Author: vanhofen Date: 2022-09-06 (Tue, 06 Sep 2022) Origin message was: ------------------ - yWeb: small reworks in Y_StreamInfo.yhtm ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Y_Boxcontrol_Channellist.yhtm | 2 +- data/y-web/Y_Main.css | 4 + data/y-web/Y_StreamInfo.yhtm | 112 ++++++++++------------- data/y-web/languages/Deutsch | 2 + data/y-web/languages/English | 2 + src/nhttpd/tuxboxapi/neutrinoyparser.cpp | 3 +- 6 files changed, 57 insertions(+), 68 deletions(-) diff --git a/data/y-web/Y_Boxcontrol_Channellist.yhtm b/data/y-web/Y_Boxcontrol_Channellist.yhtm index 4905e6a90..85c06603d 100644 --- a/data/y-web/Y_Boxcontrol_Channellist.yhtm +++ b/data/y-web/Y_Boxcontrol_Channellist.yhtm @@ -21,7 +21,7 @@ function do_stream(channelid, channelname) saveTextAsFile(plist, title, type); } function do_streaminfo() { - window.open("Y_StreamInfo.yhtm", "stream", "width=400"); + window.open("Y_StreamInfo.yhtm", "stream", "width=520"); } //]]> diff --git a/data/y-web/Y_Main.css b/data/y-web/Y_Main.css index c27da3b80..8c6a516b7 100644 --- a/data/y-web/Y_Main.css +++ b/data/y-web/Y_Main.css @@ -765,6 +765,10 @@ tr { font-size: 8pt; height: 20px; } +/* stream info */ +td.set { + vertical-align: top; +} /* bouquet*/ .bouquetlist { diff --git a/data/y-web/Y_StreamInfo.yhtm b/data/y-web/Y_StreamInfo.yhtm index 17145ae07..616048360 100644 --- a/data/y-web/Y_StreamInfo.yhtm +++ b/data/y-web/Y_StreamInfo.yhtm @@ -24,93 +24,75 @@ {=func:get_current_stream_info=}
{=L:epg.si.streaminfo=} ({=ServiceName=})
- +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - - + - + - - + - + - - + - - + - - - - - - - - - - - - + - + + - + + + + + + + + - - +
{=L:epg.si.url=}: 
{=Url=}
{=L:epg.si.resolution=}: {=VideoFormat=}
{=L:epg.si.ratio=}: 
{=AspectRatio=}
{=L:epg.si.fps=}: 
{=FPS=}
{=L:epg.si.audiotype=}: 
{=AudioType=}
{=L:epg.si.frequence=}: 
{=tsfrequency=} ({=polarisation=})
{=Url=}
  
{=L:epg.si.resolution=}:{=VideoFormat=}
{=L:epg.si.ratio=}:
{=AspectRatio=}
{=L:epg.si.fps=}:
{=FPS=}
{=L:epg.si.audiotype=}:
{=AudioType=}
{=L:epg.si.frequence=}:
{=tsfrequency=} ({=polarisation=})
 
{=L:epg.si.onid=}: 
{=onid=}
{=onid=}
{=L:epg.si.sid=}: 
{=sid=}
{=sid=}
{=L:epg.si.tsid=}: 
{=tsid=}
{=tsid=}
{=L:epg.si.vpid=}: 
{=vpid=}
{=vpid=}
{=L:epg.si.pcrpid=}: 
{=pcrpid=}
{=pcrpid=}
{=L:epg.si.pmtpid=}: 
{=pmtpid=}
{=L:epg.si.apid=}: 
{=apid=}
{=L:epg.si.vtxtpid=}: 
{=vtxtpid=}
{=pmtpid=}
 {=L:epg.si.apid=}:
{=apid=}
{=L:epg.si.vtxtpid=}:
{=vtxtpid=}
 
{=L:epg.si.crypt=}: 
{=Crypt=}
{=Crypt=}
diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index bc27f8403..43f994063 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -48,6 +48,7 @@ directory=Verzeichnis filename=Dateiname restriced_by_management_ip=Zugriff verwehrt wg. ManagementIP automatic=automatisch +unknown=unbekannt show=zeigen hide=verstecken @@ -184,6 +185,7 @@ epg.set_timer_zap=Umschalt-Timer gesetzt # ===== EPG Streaminfo epg.si.streaminfo=Streaminfo +epg.si.url=URL epg.si.resolution=Auflösung epg.si.ratio=Verhältnis epg.si.fps=Bildrate diff --git a/data/y-web/languages/English b/data/y-web/languages/English index d9bce9e27..af50d5964 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -48,6 +48,7 @@ directory=Directory filename=Filename restriced_by_management_ip=restricted by ManagementIP automatic=automatically +unknown=unknown show=show hide=hide @@ -184,6 +185,7 @@ epg.set_timer_zap=Set switch to channel. Done. # ===== EPG Streaminfo epg.si.streaminfo=Streaminfo +epg.si.url=URL epg.si.resolution=Resolution epg.si.ratio=Aspect Ratio epg.si.fps=Frames per second diff --git a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp index 2faf90926..9d7bc705b 100644 --- a/src/nhttpd/tuxboxapi/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/neutrinoyparser.cpp @@ -876,7 +876,7 @@ std::string CNeutrinoYParser::func_get_boxmodel(CyhookHandler *, std::string) //------------------------------------------------------------------------- // y-func : get stream info //------------------------------------------------------------------------- -std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, std::string) +std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, std::string) { CZapitClient::CCurrentServiceInfo serviceinfo; @@ -894,7 +894,6 @@ std::string CNeutrinoYParser::func_get_current_stream_info(CyhookHandler *hh, s 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(); hh->ParamList["FPS"] = NeutrinoAPI->getVideoFramerateAsString(); hh->ParamList["AudioType"] = NeutrinoAPI->getAudioInfoAsString();