CInfoViewer::showTitle: Add parameter forcePaintButtonBar

Origin commit data
------------------
Branch: ni/coolstream
Commit: cc05d272f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-28 (Tue, 28 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-28 15:02:09 +01:00
parent 760a820f78
commit 7329fb6294
4 changed files with 13 additions and 10 deletions

View File

@@ -696,15 +696,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();
@@ -728,7 +728,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;
@@ -780,7 +781,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
show_dot = !show_dot;
if (showButtonBar) {
infoViewerBB->paintshowButtonBar();
infoViewerBB->paintshowButtonBar(noTimer);
}
int ChanNumWidth = 0;