mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: small reworks in Y_StreamInfo.yhtm

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74de1e6f28
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2022-09-06 20:35:09 +02:00
parent 729e48d9a1
commit 30108c154b
6 changed files with 57 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/y-web/Y_Boxcontrol_Channellist.yhtm
View File

@@ -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");
}
//]]>
</script>

4
data/y-web/Y_Main.css
View File

@@ -765,6 +765,10 @@ tr {
font-size: 8pt;
height: 20px;
}
/* stream info */
td.set {
vertical-align: top;
}
/* bouquet*/
.bouquetlist
{

112
data/y-web/Y_StreamInfo.yhtm
View File

@@ -24,93 +24,75 @@
{=func:get_current_stream_info=}
<div class="y_head">{=L:epg.si.streaminfo=} ({=ServiceName=})</div>
<div class="y_work_box">
<table cellspacing="2" cellpadding="3" class="tableborder" width="300px">
<table class="tableborder" width="480px">
<tr>
<td class="set"><b>{=L:epg.si.url=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=Url=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.resolution=}:</b></td>
<td width="30">&nbsp;</td>
<td class="set">{=VideoFormat=}</td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.ratio=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=AspectRatio=}</div></td>
</tr>
<!-- <tr>
<td class="set"><b>Bitrate:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=BitRate=} bit/sec</div></td>
</tr>
-->
<tr>
<td class="set"><b>{=L:epg.si.fps=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=FPS=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.audiotype=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=AudioType=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.frequence=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=tsfrequency=} ({=polarisation=})</div></td>
<td class="set"><div align="left">{=Url=}</div></td>
</tr>
<tr>
<td class="set" colspan="3">&nbsp;</td>
<td class="set" colspan="2">&nbsp;</td>
</tr>
<tr>
<tr>
<td class="set"><b>{=L:epg.si.resolution=}:</b></td>
<td class="set">{=VideoFormat=}</td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.ratio=}:</b></td>
<td class="set"><div align="left">{=AspectRatio=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.fps=}:</b></td>
<td class="set"><div align="left">{=FPS=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.audiotype=}:</b></td>
<td class="set"><div align="left">{=AudioType=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.frequence=}:</b></td>
<td class="set"><div align="left">{=tsfrequency=} ({=polarisation=})</div></td>
</tr>
<tr>
<td class="set" colspan="2">&nbsp;</td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.onid=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=onid=}</div></td>
<td class="set"><div align="left">{=onid=}</div></td>
</tr>
<tr>
<tr>
<td class="set"><b>{=L:epg.si.sid=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=sid=}</div></td>
<td class="set"><div align="left">{=sid=}</div></td>
</tr>
<tr>
<tr>
<td class="set"><b>{=L:epg.si.tsid=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=tsid=}</div></td>
<td class="set"><div align="left">{=tsid=}</div></td>
</tr>
<tr>
<tr>
<td class="set"><b>{=L:epg.si.vpid=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=vpid=}</div></td>
<td class="set"><div align="left">{=vpid=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.pcrpid=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=pcrpid=}</div></td>
<td class="set"><div align="left">{=pcrpid=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.pmtpid=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=pmtpid=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.apid=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=apid=}</div></td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.vtxtpid=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=vtxtpid=}</div></td>
<td class="set"><div align="left">{=pmtpid=}</div></td>
</tr>
<tr>
<td class="set" colspan="3">&nbsp;</td>
<td class="set"><b>{=L:epg.si.apid=}:</b></td>
<td class="set"><div align="left">{=apid=}</div></td>
</tr>
<tr>
<tr>
<td class="set"><b>{=L:epg.si.vtxtpid=}:</b></td>
<td class="set"><div align="left">{=vtxtpid=}</div></td>
</tr>
<tr>
<td class="set" colspan="2">&nbsp;</td>
</tr>
<tr>
<td class="set"><b>{=L:epg.si.crypt=}:</b></td>
<td>&nbsp;</td>
<td class="set"> <div align="left">{=Crypt=}</div></td>
<td class="set"><div align="left">{=Crypt=}</div></td>
</tr>
</table>
</div>

2
data/y-web/languages/Deutsch
View File

@@ -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&ouml;sung
epg.si.ratio=Verh&auml;ltnis
epg.si.fps=Bildrate

2
data/y-web/languages/English
View File

@@ -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

3
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -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();