mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-11 15:41:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

- streaminfo2: use official notation for abbreviations

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2019-03-17 00:13:00 +01:00
committed by Thilo Graf
parent d523fa42ed
commit 4748b3be40
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -2416,7 +2416,7 @@ streaminfo.audiotype Audiotyp
streaminfo.audiotype_unknown unbekannt streaminfo.audiotype_unknown unbekannt
streaminfo.average_bitrate Durchschnitt streaminfo.average_bitrate Durchschnitt
streaminfo.bitrate Bitrate streaminfo.bitrate Bitrate
streaminfo.casystems Cryptsysteme streaminfo.casystems CA ID(s)
streaminfo.framerate Bildrate streaminfo.framerate Bildrate
streaminfo.framerate_unknown unbekannt streaminfo.framerate_unknown unbekannt
streaminfo.head Technische Informationen streaminfo.head Technische Informationen

2
data/locale/english.locale
View File

@@ -2416,7 +2416,7 @@ streaminfo.audiotype Audiotype
streaminfo.audiotype_unknown unknown streaminfo.audiotype_unknown unknown
streaminfo.average_bitrate Average streaminfo.average_bitrate Average
streaminfo.bitrate Bitrate streaminfo.bitrate Bitrate
streaminfo.casystems Conditional access systems streaminfo.casystems CA ID(s)
streaminfo.framerate Framerate streaminfo.framerate Framerate
streaminfo.framerate_unknown unknown streaminfo.framerate_unknown unknown
streaminfo.head Technical informations streaminfo.head Technical informations

18
src/gui/streaminfo2.cpp
View File

@@ -1114,7 +1114,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
if (!mp) if (!mp)
{ {
// onid // onid
r.key = "ONid: "; r.key = "ONID: ";
i = channel->getOriginalNetworkId(); i = channel->getOriginalNetworkId();
snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i); snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i);
r.val = buf; r.val = buf;
@@ -1122,7 +1122,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
v.push_back(r); v.push_back(r);
// tsid // tsid
r.key = "TSid: "; r.key = "TSID: ";
i = channel->getTransportStreamId(); i = channel->getTransportStreamId();
snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i); snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i);
r.val = buf; r.val = buf;
@@ -1130,7 +1130,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
v.push_back(r); v.push_back(r);
// sid // sid
r.key = "Sid: "; r.key = "SID: ";
i = channel->getServiceId(); i = channel->getServiceId();
snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i); snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i);
r.val = buf; r.val = buf;
@@ -1138,7 +1138,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
v.push_back(r); v.push_back(r);
// pmtpid // pmtpid
r.key = "PMTpid: "; r.key = "PMT PID: ";
i = channel->getPmtPid(); i = channel->getPmtPid();
pmt_version = channel->getPmtVersion(); pmt_version = channel->getPmtVersion();
snprintf(buf, sizeof(buf), "0x%04X (%i) [0x%02X]", i, i, pmt_version); snprintf(buf, sizeof(buf), "0x%04X (%i) [0x%02X]", i, i, pmt_version);
@@ -1149,7 +1149,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
//vtxtpid //vtxtpid
if (g_RemoteControl->current_PIDs.PIDs.vtxtpid) if (g_RemoteControl->current_PIDs.PIDs.vtxtpid)
{ {
r.key = "VTXTpid: "; r.key = "VT PID: ";
i = g_RemoteControl->current_PIDs.PIDs.vtxtpid; i = g_RemoteControl->current_PIDs.PIDs.vtxtpid;
snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i); snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i);
r.val = buf; r.val = buf;
@@ -1161,7 +1161,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
// video pid // video pid
if (g_RemoteControl->current_PIDs.PIDs.vpid) if (g_RemoteControl->current_PIDs.PIDs.vpid)
{ {
r.key = "Vpid: "; r.key = "Video PID: ";
i = g_RemoteControl->current_PIDs.PIDs.vpid; i = g_RemoteControl->current_PIDs.PIDs.vpid;
snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i); snprintf(buf, sizeof(buf), "0x%04X (%i)", i, i);
r.val = buf; r.val = buf;
@@ -1174,7 +1174,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
{ {
for (unsigned int li = 0; li < g_RemoteControl->current_PIDs.APIDs.size(); li++) for (unsigned int li = 0; li < g_RemoteControl->current_PIDs.APIDs.size(); li++)
{ {
r.key = li ? "" : "Apid(s): "; r.key = li ? "" : "Audio PID(s): ";
i = g_RemoteControl->current_PIDs.APIDs[li].pid; i = g_RemoteControl->current_PIDs.APIDs[li].pid;
std::string strpid = to_string(i); std::string strpid = to_string(i);
std::string details(" "); std::string details(" ");
@@ -1324,10 +1324,10 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
{ {
if (cryptsystems) if (cryptsystems)
{ {
ypos += iheight; ypos += sheight;
std::string casys_locale(g_Locale->getText(LOCALE_STREAMINFO_CASYSTEMS)); std::string casys_locale(g_Locale->getText(LOCALE_STREAMINFO_CASYSTEMS));
casys_locale += ":"; casys_locale += ":";
g_FixedFont[font_info]->RenderString(xpos , ypos, box_width, casys_locale, COL_MENUCONTENT_TEXT); g_FixedFont[font_small]->RenderString(xpos, ypos, box_width, casys_locale, COL_MENUCONTENT_TEXT);
cryptsystems = false; cryptsystems = false;
} }
ypos += sheight; ypos += sheight;