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

streaminfo2: pre-init col in struct row

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2969c7cd99
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-03-16 (Sat, 16 Mar 2019)

Origin message was:
------------------
- streaminfo2: pre-init col in struct row

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-03-16 21:15:46 +01:00
parent 7796c5fc70
commit d9d89e9476
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/streaminfo2.cpp
View File

@@ -824,7 +824,10 @@ struct row {
std::string val; std::string val;
Font *f; Font *f;
int col; int col;
row(): f(g_FixedFont[SNeutrinoSettings::FONT_TYPE_FIXED_20_BOLD])
row():
f(g_FixedFont[SNeutrinoSettings::FONT_TYPE_FIXED_20_BOLD]),
col(COL_MENUCONTENT_TEXT)
{ {
} }
}; };
@@ -860,14 +863,12 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key = g_Locale->getText (LOCALE_TIMERLIST_CHANNEL); r.key = g_Locale->getText (LOCALE_TIMERLIST_CHANNEL);
r.key += ": "; r.key += ": ";
r.val = channel->getName().c_str(); r.val = channel->getName().c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
// url // url
r.key = "URL"; r.key = "URL";
r.key += ": "; r.key += ": ";
r.val = channel->getUrl(); r.val = channel->getUrl();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
// provider // provider
@@ -879,7 +880,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key = g_Locale->getText (LOCALE_CHANNELLIST_PROVS); r.key = g_Locale->getText (LOCALE_CHANNELLIST_PROVS);
r.key += ": "; r.key += ": ";
r.val = prov_name.c_str(); r.val = prov_name.c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
} }
} }
@@ -889,7 +889,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key = g_Locale->getText (LOCALE_MOVIEBROWSER_INFO_FILE); r.key = g_Locale->getText (LOCALE_MOVIEBROWSER_INFO_FILE);
r.key += ": "; r.key += ": ";
r.val = mp->GetFile(); r.val = mp->GetFile();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
} }
@@ -901,7 +900,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key = g_Locale->getText (LOCALE_TIMERLIST_CHANNEL); r.key = g_Locale->getText (LOCALE_TIMERLIST_CHANNEL);
r.key += ": "; r.key += ": ";
r.val = channel->getName().c_str(); r.val = channel->getName().c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
// provider // provider
@@ -914,7 +912,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key = g_Locale->getText (LOCALE_CHANNELLIST_PROVS); r.key = g_Locale->getText (LOCALE_CHANNELLIST_PROVS);
r.key += ": "; r.key += ": ";
r.val = prov_name.c_str(); r.val = prov_name.c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
} }
@@ -932,7 +929,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key += ": "; r.key += ": ";
r.val = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition()).c_str(); r.val = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition()).c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
// ts frequency // ts frequency
@@ -941,7 +937,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
scaling = 15000; scaling = 15000;
r.key = g_Locale->getText (LOCALE_SCANTS_FREQDATA); r.key = g_Locale->getText (LOCALE_SCANTS_FREQDATA);
r.val = t.description(); r.val = t.description();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
// empty line // empty line
@@ -955,7 +950,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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;
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
} }
@@ -983,7 +977,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key += ": "; r.key += ": ";
snprintf (buf, sizeof(buf), "%dx%d", xres, yres); snprintf (buf, sizeof(buf), "%dx%d", xres, yres);
r.val = buf; r.val = buf;
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
std::string tmp_fps = ""; std::string tmp_fps = "";
@@ -1005,7 +998,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key += ": "; r.key += ": ";
snprintf(buf, sizeof(buf), "%dx%d", frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true)); snprintf(buf, sizeof(buf), "%dx%d", frameBuffer->getScreenWidth(true), frameBuffer->getScreenHeight(true));
r.val = buf; r.val = buf;
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
// aspect ratio // aspect ratio
@@ -1022,7 +1014,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
const char *arr[] = { "N/A", "4:3", "14:9", "16:9", "20:9" }; const char *arr[] = { "N/A", "4:3", "14:9", "16:9", "20:9" };
r.val = arr[aspectRatio]; r.val = arr[aspectRatio];
} }
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
// video framerate // video framerate
@@ -1041,7 +1032,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
const char *arr[] = { "23.976fps", "24fps", "25fps", "29,97fps", "30fps", "50fps", "59,94fps", "60fps" }; const char *arr[] = { "23.976fps", "24fps", "25fps", "29,97fps", "30fps", "50fps", "59,94fps", "60fps" };
r.val = arr[framerate]; r.val = arr[framerate];
} }
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
// place for average bitrate // place for average bitrate
@@ -1065,7 +1055,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key = (*it)["codec_type"]; r.key = (*it)["codec_type"];
r.key += ": "; r.key += ": ";
r.val = details.c_str(); r.val = details.c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
} }
} }
@@ -1078,7 +1067,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
if (!mp && !g_RemoteControl->current_PIDs.APIDs.empty()) if (!mp && !g_RemoteControl->current_PIDs.APIDs.empty())
desc = g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].desc; desc = g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].desc;
r.val = mp ? mp->getAPIDDesc(mp->getAPID()).c_str() : desc.c_str(); r.val = mp ? mp->getAPIDDesc(mp->getAPID()).c_str() : desc.c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
if (mp) if (mp)
@@ -1097,7 +1085,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key = (*it)["codec_type"]; r.key = (*it)["codec_type"];
r.key += ": "; r.key += ": ";
r.val = details.c_str(); r.val = details.c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
} }
} }
@@ -1113,7 +1100,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key += ": "; r.key += ": ";
snprintf(buf, sizeof(buf), "%llx.png", channel->getChannelID() & 0xFFFFFFFFFFFFULL); snprintf(buf, sizeof(buf), "%llx.png", channel->getChannelID() & 0xFFFFFFFFFFFFULL);
r.val = buf; r.val = buf;
r.col = COL_MENUCONTENT_TEXT;
r.f = g_FixedFont[font_small]; r.f = g_FixedFont[font_small];
v.push_back(r); v.push_back(r);
} }
@@ -1158,7 +1144,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.key += ": "; r.key += ": ";
snprintf(buf, sizeof(buf), "%llx.png", channel->getChannelID() & 0xFFFFFFFFFFFFULL); snprintf(buf, sizeof(buf), "%llx.png", channel->getChannelID() & 0xFFFFFFFFFFFFULL);
r.val = buf; r.val = buf;
r.col = COL_MENUCONTENT_TEXT;
r.f = g_FixedFont[font_small]; r.f = g_FixedFont[font_small];
v.push_back(r); v.push_back(r);
@@ -1167,7 +1152,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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;
r.col = COL_MENUCONTENT_TEXT;
r.f = g_FixedFont[font_small]; r.f = g_FixedFont[font_small];
v.push_back(r); v.push_back(r);
@@ -1176,7 +1160,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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;
r.col = COL_MENUCONTENT_TEXT;
r.f = g_FixedFont[font_small]; r.f = g_FixedFont[font_small];
v.push_back(r); v.push_back(r);
@@ -1185,7 +1168,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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;
r.col = COL_MENUCONTENT_TEXT;
r.f = g_FixedFont[font_small]; r.f = g_FixedFont[font_small];
v.push_back(r); v.push_back(r);
@@ -1195,7 +1177,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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);
r.val = buf; r.val = buf;
r.col = COL_MENUCONTENT_TEXT;
r.f = g_FixedFont[font_small]; r.f = g_FixedFont[font_small];
v.push_back(r); v.push_back(r);
@@ -1206,7 +1187,6 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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;
r.col = COL_MENUCONTENT_TEXT;
r.f = g_FixedFont[font_small]; r.f = g_FixedFont[font_small];
v.push_back(r); v.push_back(r);
} }