mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

CInfoViewer::showTitle: Add parameter forcePaintButtonBar

Browse Source
This commit is contained in:
M. Liebmann
2017-02-28 15:02:09 +01:00
parent 653e574937
commit cc05d272f2
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer.cpp
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); CZapitChannel * channel = CServiceManager::getInstance()->FindChannel(chid);
if(channel) 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)) if(!calledFromNumZap && !(zap_mode & IV_MODE_DEFAULT))
resetSwitchMode(); resetSwitchMode();
@@ -728,7 +728,8 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
check_channellogo_ca_SettingsChange(); check_channellogo_ca_SettingsChange();
aspectRatio = 0; aspectRatio = 0;
last_curr_id = last_next_id = 0; last_curr_id = last_next_id = 0;
showButtonBar = !calledFromNumZap; showButtonBar = (!calledFromNumZap || forcePaintButtonBar);
bool noTimer = (calledFromNumZap && forcePaintButtonBar);
fileplay = (ChanNum == 0); fileplay = (ChanNum == 0);
newfreq = true; newfreq = true;
@@ -780,7 +781,7 @@ void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap
show_dot = !show_dot; show_dot = !show_dot;
if (showButtonBar) { if (showButtonBar) {
infoViewerBB->paintshowButtonBar(); infoViewerBB->paintshowButtonBar(noTimer);
} }
int ChanNumWidth = 0; int ChanNumWidth = 0;

4
src/gui/infoviewer.h
View File

@@ -173,8 +173,8 @@ class CInfoViewer
void start(); void start();
void showEpgInfo(); void showEpgInfo();
void showTitle(CZapitChannel * channel, const bool calledFromNumZap = false, int epgpos = 0); void showTitle(CZapitChannel * channel, const bool calledFromNumZap = false, int epgpos = 0, bool forcePaintButtonBar = false);
void showTitle(t_channel_id channel_id, const bool calledFromNumZap = false, int epgpos = 0); void showTitle(t_channel_id channel_id, const bool calledFromNumZap = false, int epgpos = 0, bool forcePaintButtonBar = false);
void lookAheadEPG(const int ChanNum, const std::string & Channel, const t_channel_id new_channel_id = 0, const bool calledFromNumZap = false); //alpha: fix for nvod subchannel update void lookAheadEPG(const int ChanNum, const std::string & Channel, const t_channel_id new_channel_id = 0, const bool calledFromNumZap = false); //alpha: fix for nvod subchannel update
void killTitle(); void killTitle();
CSectionsdClient::CurrentNextInfo getEPG(const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info); CSectionsdClient::CurrentNextInfo getEPG(const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info);

6
src/gui/infoviewer_bb.cpp
View File

@@ -458,7 +458,7 @@ void CInfoViewerBB::showBBIcons(const int modus, const std::string & icon)
} }
} }
void CInfoViewerBB::paintshowButtonBar() void CInfoViewerBB::paintshowButtonBar(bool noTimer/*=false*/)
{ {
if (!is_visible) if (!is_visible)
return; return;
@@ -466,7 +466,9 @@ void CInfoViewerBB::paintshowButtonBar()
for (int i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) { for (int i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) {
tmp_bbButtonInfoText[i] = ""; tmp_bbButtonInfoText[i] = "";
} }
g_InfoViewer->sec_timer_id = g_RCInput->addTimer(1*1000*1000, false);
if (!noTimer)
g_InfoViewer->sec_timer_id = g_RCInput->addTimer(1*1000*1000, false);
if (g_settings.infobar_casystem_display < 2) if (g_settings.infobar_casystem_display < 2)
paint_ca_bar(); paint_ca_bar();

2
src/gui/infoviewer_bb.h
View File

@@ -141,7 +141,7 @@ class CInfoViewerBB
void showIcon_Tuner(void); void showIcon_Tuner(void);
void showIcon_DD(void); void showIcon_DD(void);
void showBBButtons(bool paintFooter = false); void showBBButtons(bool paintFooter = false);
void paintshowButtonBar(); void paintshowButtonBar(bool noTimer = false);
void getBBButtonInfo(void); void getBBButtonInfo(void);
void reset_allScala(void); void reset_allScala(void);
void initBBOffset(void); void initBBOffset(void);