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 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7829247fe8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-28 15:36:23 +01:00
parent a7cdb2e024 ff6188530e
commit bf56f9f0bc
21 changed files with 310 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer.cpp
View File

@@ -726,15 +726,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();
@@ -758,7 +758,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;
@@ -820,7 +821,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
InfoIcons->paintIcons(true);
if (showButtonBar) {
infoViewerBB->paintshowButtonBar();
infoViewerBB->paintshowButtonBar(noTimer);
}
int ChanNumWidth = 0;