From f04493b7e5d311979d47d0d3f81e07e971b2c17c Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Wed, 12 Oct 2016 20:55:28 +0200 Subject: [PATCH] - eventlist: remove obsolete bool show from CEventList::showFunctionBar --- src/gui/eventlist.cpp | 28 +++++++++++----------------- src/gui/eventlist.h | 2 +- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 8659fcbae..c3aa1059d 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -331,7 +331,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna bool dont_hide = false; paintHead(channel_id, channelname, channelname_prev, channelname_next); paint(channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); int oldselected = selected; @@ -378,7 +378,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna else paintItem(selected - liststart, channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); } //sort else if (!showfollow && (msg == (neutrino_msg_t)g_settings.key_channelList_sort)) @@ -436,7 +436,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna timerlist.clear(); g_Timerd->getTimerList (timerlist); paint(evtlist[selected].channelID); - showFunctionBar(true, evtlist[selected].channelID); + showFunctionBar(evtlist[selected].channelID); continue; } std::string recDir = g_settings.network_nfs_recordingdir; @@ -491,7 +491,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna timerlist.clear(); g_Timerd->getTimerList (timerlist); paint(used_id); - showFunctionBar(true, used_id); + showFunctionBar(used_id); } } else if ( msg == (neutrino_msg_t) g_settings.key_channelList_addremind )//add/remove zapto timer event @@ -503,7 +503,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna timerlist.clear(); g_Timerd->getTimerList (timerlist); paint(evtlist[selected].channelID); - showFunctionBar(true, evtlist[selected].channelID); + showFunctionBar(evtlist[selected].channelID); continue; } @@ -515,7 +515,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna timerlist.clear(); g_Timerd->getTimerList (timerlist); paint(evtlist[selected].channelID ); - showFunctionBar(true, evtlist[selected].channelID ); + showFunctionBar(evtlist[selected].channelID ); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); } else if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) @@ -526,7 +526,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna paintHead(channel_id, channelname); readEvents(epg_id); paint(channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); } else { selected = oldselected; if(fader.StartFadeOut()) { @@ -589,7 +589,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna oldEventID = -1; bgRightBoxPaint = false; paint(channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); } else if (msg == CRCInput::RC_epg) @@ -632,7 +632,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna oldEventID = -1; bgRightBoxPaint = false; paint(channel_id); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); } } @@ -938,19 +938,13 @@ void CEventList::paint(t_channel_id channel_id) } -void CEventList::showFunctionBar (bool show, t_channel_id channel_id) +void CEventList::showFunctionBar(t_channel_id channel_id) { int bx = x; int bw = full_width; int bh = iheight; int by = y + height - bh; - if (! show) { - // -- hide only? - frameBuffer->paintBackgroundBoxRel(bx,by,bw,bh); - return; - } - CColorKeyHelper keyhelper; //user_menue.h neutrino_msg_t dummy = CRCInput::RC_nokey; const char * icon = NULL; @@ -1160,7 +1154,7 @@ bool CEventList::findEvents(t_channel_id channel_id, std::string channelname) else paintHead(channel_id, channelname); paint(); - showFunctionBar(true, channel_id); + showFunctionBar(channel_id); return(res); } diff --git a/src/gui/eventlist.h b/src/gui/eventlist.h index 25e9e656e..2c47b63e3 100644 --- a/src/gui/eventlist.h +++ b/src/gui/eventlist.h @@ -114,7 +114,7 @@ class CEventList : public CListHelpers void paint(t_channel_id channel_id = 0); void paintHead(t_channel_id _channel_id, std::string _channelname, std::string _channelname_prev = "", std::string _channelname_next = ""); void hide(); - void showFunctionBar(bool show, t_channel_id channel_id); + void showFunctionBar(t_channel_id channel_id); int timerPre; int timerPost;