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

infoviewer: fix FIXME comment in c3415790b1

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91a033dfb0
Author: TangoCash <eric@loxat.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- infoviewer: fix FIXME comment in c3415790b1

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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2017-11-07 16:52:46 +01:00
committed by vanhofen
parent 144a791247
commit efa517c6f9
1 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/gui/infoviewer.cpp
View File

@@ -984,17 +984,23 @@ bool CInfoViewer::showLivestreamInfo()
{ {
CZapitChannel * cc = CZapit::getInstance()->GetCurrentChannel(); CZapitChannel * cc = CZapit::getInstance()->GetCurrentChannel();
bool web_mode = (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio); bool web_mode = (CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webtv || CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_webradio);
if (web_mode && cc->getEpgID() == 0 && !cc->getScriptName().empty()) { if (web_mode && cc->getEpgID() == 0)
{
std::string livestreamInfo1 = ""; std::string livestreamInfo1 = "";
std::string livestreamInfo2 = ""; std::string livestreamInfo2 = "";
std::string tmp1 = "";
CMoviePlayerGui::getInstance().getLivestreamInfo(&livestreamInfo1, &tmp1);
if (!(videoDecoder->getBlank())) { if (!cc->getScriptName().empty())
int xres = 0, yres = 0, framerate = 0; {
std::string tmp2; std::string tmp1 = "";
videoDecoder->getPictureInfo(xres, yres, framerate); CMoviePlayerGui::getInstance().getLivestreamInfo(&livestreamInfo1, &tmp1);
switch (framerate) {
if (!(videoDecoder->getBlank()))
{
int xres, yres, framerate;
std::string tmp2;
videoDecoder->getPictureInfo(xres, yres, framerate);
switch (framerate)
{
case 0: case 0:
tmp2 = "23.976fps"; tmp2 = "23.976fps";
break; break;
@@ -1020,16 +1026,55 @@ bool CInfoViewer::showLivestreamInfo()
tmp2 = "60fps"; tmp2 = "60fps";
break; break;
default: default:
framerate = 0;
tmp2 = g_Locale->getText(LOCALE_STREAMINFO_FRAMERATE_UNKNOWN); tmp2 = g_Locale->getText(LOCALE_STREAMINFO_FRAMERATE_UNKNOWN);
break; break;
}
livestreamInfo2 = to_string(xres) + "x" + to_string(yres) + ", " + tmp2;
if (!tmp1.empty())
livestreamInfo2 += (std::string)", " + tmp1;
}
}
else
{
// try to get meta data
std::string artist = "";
std::string title = "";
std::vector<std::string> keys, values;
cPlayback *playback = CMoviePlayerGui::getInstance().getPlayback();
if (playback)
playback->GetMetadata(keys, values);
size_t count = keys.size();
if (count > 0)
{
for (size_t i = 0; i < count; i++)
{
std::string key = trim(keys[i]);
if (!strcasecmp("artist", key.c_str()))
{
artist = isUTF8(values[i]) ? values[i] : convertLatin1UTF8(values[i]);
continue;
}
if (!strcasecmp("title", key.c_str()))
{
title = isUTF8(values[i]) ? values[i] : convertLatin1UTF8(values[i]);
continue;
}
}
}
if (!artist.empty())
{
livestreamInfo1 = artist;
}
if (!title.empty())
{
if (!livestreamInfo1.empty())
livestreamInfo1 += " - ";
livestreamInfo1 += title;
} }
livestreamInfo2 = to_string(xres) + "x" + to_string(yres) + ", " + tmp2;
if (!tmp1.empty())
livestreamInfo2 += (std::string)", " + tmp1;
} }
if (livestreamInfo1 != _livestreamInfo1 || livestreamInfo2 != _livestreamInfo2) { if (livestreamInfo1 != _livestreamInfo1 || livestreamInfo2 != _livestreamInfo2)
{
display_Info(livestreamInfo1.c_str(), livestreamInfo2.c_str(), false); display_Info(livestreamInfo1.c_str(), livestreamInfo2.c_str(), false);
_livestreamInfo1 = livestreamInfo1; _livestreamInfo1 = livestreamInfo1;
_livestreamInfo2 = livestreamInfo2; _livestreamInfo2 = livestreamInfo2;
@@ -1037,51 +1082,6 @@ bool CInfoViewer::showLivestreamInfo()
} }
return true; return true;
} }
// FIXME: move this block in the block above
else if (web_mode && cc->getEpgID() == 0)
{
// try to get meta data
std::string livestreamInfo1 = "";
std::string livestreamInfo2 = "";
std::string artist = "";
std::string title = "";
std::vector<std::string> keys, values;
cPlayback *playback = CMoviePlayerGui::getInstance().getPlayback();
if (playback)
playback->GetMetadata(keys, values);
size_t count = keys.size();
if (count > 0) {
for (size_t i = 0; i < count; i++) {
std::string key = trim(keys[i]);
if (!strcasecmp("artist", key.c_str())) {
artist = isUTF8(values[i]) ? values[i] : convertLatin1UTF8(values[i]);
continue;
}
if (!strcasecmp("title", key.c_str())) {
title = isUTF8(values[i]) ? values[i] : convertLatin1UTF8(values[i]);
continue;
}
}
}
if (!artist.empty())
{
livestreamInfo1 = artist;
}
if (!title.empty())
{
if (!livestreamInfo1.empty())
livestreamInfo1 += " - ";
livestreamInfo1 += title;
}
if (livestreamInfo1 != _livestreamInfo1 || livestreamInfo2 != _livestreamInfo2) {
display_Info(livestreamInfo1.c_str(), livestreamInfo2.c_str(), false);
_livestreamInfo1 = livestreamInfo1;
_livestreamInfo2 = livestreamInfo2;
infoViewerBB->showBBButtons(true /*paintFooter*/);
}
return true;
}
return false; return false;
} }