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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-23 15:24:38 +02:00
parent 90a51a4564 6b015862c1
commit 79c24b3173
15 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/infoviewer.cpp
View File

@@ -991,7 +991,7 @@ bool CInfoViewer::showLivestreamInfo()
CMoviePlayerGui::getInstance().getLivestreamInfo(&livestreamInfo1, &tmp1);
if (!(videoDecoder->getBlank())) {
int xres, yres, framerate;
int xres = 0, yres = 0, framerate = 0;
std::string tmp2;
videoDecoder->getPictureInfo(xres, yres, framerate);
switch (framerate) {
@@ -1020,6 +1020,7 @@ bool CInfoViewer::showLivestreamInfo()
tmp2 = "60fps";
break;
default:
framerate = 0;
tmp2 = g_Locale->getText(LOCALE_STREAMINFO_FRAMERATE_UNKNOWN);
break;
}
@@ -1127,7 +1128,6 @@ void CInfoViewer::loop(bool show_dot)
//printf("%s:%d: imitate VZAP; RC_left/right\n", __func__, __LINE__);
CMoviePlayerGui::getInstance().setFromInfoviewer(true);
g_RCInput->postMsg (msg, data);
hideIt = true;
}
else
setSwitchMode(IV_MODE_VIRTUAL_ZAP);