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 remote-tracking branch 'check/cst-next'

Browse Source 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
This commit is contained in:
Stefan Seyfried
2014-12-28 12:32:12 +01:00
parent b6e2fb9527 d410f1c54f
commit d1e2143fd6
112 changed files with 2783 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/streaminfo2.cpp
View File

@@ -455,7 +455,8 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos)
return;
transponder t;
CServiceManager::getInstance()->GetTransponder(channel->getTransponderId(), t);
//CServiceManager::getInstance()->GetTransponder(channel->getTransponderId(), t);
t = *frontend->getParameters();
int array[6]={g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_STREAMINFO_RESOLUTION)),
g_Font[font_info]->getRenderWidth(g_Locale->getText (LOCALE_STREAMINFO_ARATIO)),