Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-25 14:15:22 +02:00
40 changed files with 225 additions and 133 deletions

View File

@@ -988,7 +988,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) {
@@ -1017,6 +1017,7 @@ bool CInfoViewer::showLivestreamInfo()
tmp2 = "60fps";
break;
default:
framerate = 0;
tmp2 = g_Locale->getText(LOCALE_STREAMINFO_FRAMERATE_UNKNOWN);
break;
}
@@ -1124,7 +1125,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);