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

- streaminfo: add channelname for webtv/radio too; simplify code

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-11-06 23:08:43 +01:00
committed by Thilo Graf
parent f033e623c3
commit d3d02047a4
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gui/streaminfo2.cpp
View File

@@ -827,29 +827,39 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
{ {
if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio) if (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio)
{ {
// channel
r.key = g_Locale->getText (LOCALE_TIMERLIST_CHANNEL);
r.key += ": ";
r.val = channel->getName().c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r);
// url // url
r.key = "URL"; r.key = "URL";
r.key += ": ";
r.val = channel->getUrl(); r.val = channel->getUrl();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r);
// provider
if (channel->pname)
{
std::string prov_name = channel->pname;
prov_name.erase(std::remove(prov_name.begin(), prov_name.end(), '['), prov_name.end());
prov_name.erase(std::remove(prov_name.begin(), prov_name.end(), ']'), prov_name.end());
r.key = g_Locale->getText (LOCALE_CHANNELLIST_PROVS);
r.key += ": ";
r.val = prov_name.c_str();
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r);
}
} }
else else
{ {
// file // file
r.key = g_Locale->getText (LOCALE_MOVIEBROWSER_INFO_FILE); r.key = g_Locale->getText (LOCALE_MOVIEBROWSER_INFO_FILE);
r.val = mp->GetFile();
}
r.key += ": ";
r.col = COL_MENUCONTENT_TEXT;
v.push_back(r);
//provider
if ((CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv) && (channel->pname))
{
std::string prov_name = channel->pname;
prov_name.erase(std::remove(prov_name.begin(), prov_name.end(), '['), prov_name.end());
prov_name.erase(std::remove(prov_name.begin(), prov_name.end(), ']'), prov_name.end());
r.key = g_Locale->getText (LOCALE_CHANNELLIST_PROVS);
r.key += ": "; r.key += ": ";
r.val = prov_name.c_str(); r.val = mp->GetFile();
r.col = COL_MENUCONTENT_TEXT; r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
} }
@@ -865,7 +875,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
r.col = COL_MENUCONTENT_TEXT; r.col = COL_MENUCONTENT_TEXT;
v.push_back(r); v.push_back(r);
//provider // provider
if (channel->pname) if (channel->pname)
{ {
std::string prov_name = channel->pname; std::string prov_name = channel->pname;
@@ -1065,6 +1075,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
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.col = COL_MENUCONTENT_TEXT;
r.f = g_Font[font_small];
v.push_back(r); v.push_back(r);
} }
} }