mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-10 23:28:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)
This commit is contained in:
vanhofen
2017-02-28 16:55:39 +01:00
parent 6556882cb1 f5d9d25957
commit 68e2832f96
27 changed files with 348 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer.cpp
View File

@@ -725,15 +725,15 @@ void CInfoViewer::check_channellogo_ca_SettingsChange()
}
}
void CInfoViewer::showTitle(t_channel_id chid, const bool calledFromNumZap, int epgpos)
void CInfoViewer::showTitle(t_channel_id chid, const bool calledFromNumZap, int epgpos, bool forcePaintButtonBar/*=false*/)
{
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(chid);
if(channel)
showTitle(channel, calledFromNumZap, epgpos);
showTitle(channel, calledFromNumZap, epgpos, forcePaintButtonBar);
}
void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap, int epgpos)
void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap, int epgpos, bool forcePaintButtonBar/*=false*/)
{
if(!calledFromNumZap && !(zap_mode & IV_MODE_DEFAULT))
resetSwitchMode();
@@ -757,7 +757,8 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
check_channellogo_ca_SettingsChange();
aspectRatio = 0;
last_curr_id = last_next_id = 0;
showButtonBar = !calledFromNumZap;
showButtonBar = (!calledFromNumZap || forcePaintButtonBar);
bool noTimer = (calledFromNumZap && forcePaintButtonBar);
fileplay = (ChanNum == 0);
newfreq = true;
@@ -817,7 +818,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
InfoIcons->paintIcons(true);
if (showButtonBar) {
infoViewerBB->paintshowButtonBar();
infoViewerBB->paintshowButtonBar(noTimer);
}
int ChanNumWidth = 0;