mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- eventlist: remove obsolete bool show from CEventList::showFunctionBar

Browse Source
This commit is contained in:
svenhoefer
2016-10-12 20:55:28 +02:00
parent 4b0b32833f
commit f04493b7e5
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/eventlist.cpp
View File

@@ -331,7 +331,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
bool dont_hide = false; bool dont_hide = false;
paintHead(channel_id, channelname, channelname_prev, channelname_next); paintHead(channel_id, channelname, channelname_prev, channelname_next);
paint(channel_id); paint(channel_id);
showFunctionBar(true, channel_id); showFunctionBar(channel_id);
int oldselected = selected; int oldselected = selected;
@@ -378,7 +378,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
else else
paintItem(selected - liststart, channel_id); paintItem(selected - liststart, channel_id);
showFunctionBar(true, channel_id); showFunctionBar(channel_id);
} }
//sort //sort
else if (!showfollow && (msg == (neutrino_msg_t)g_settings.key_channelList_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(); timerlist.clear();
g_Timerd->getTimerList (timerlist); g_Timerd->getTimerList (timerlist);
paint(evtlist[selected].channelID); paint(evtlist[selected].channelID);
showFunctionBar(true, evtlist[selected].channelID); showFunctionBar(evtlist[selected].channelID);
continue; continue;
} }
std::string recDir = g_settings.network_nfs_recordingdir; 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(); timerlist.clear();
g_Timerd->getTimerList (timerlist); g_Timerd->getTimerList (timerlist);
paint(used_id); 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 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(); timerlist.clear();
g_Timerd->getTimerList (timerlist); g_Timerd->getTimerList (timerlist);
paint(evtlist[selected].channelID); paint(evtlist[selected].channelID);
showFunctionBar(true, evtlist[selected].channelID); showFunctionBar(evtlist[selected].channelID);
continue; continue;
} }
@@ -515,7 +515,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
timerlist.clear(); timerlist.clear();
g_Timerd->getTimerList (timerlist); g_Timerd->getTimerList (timerlist);
paint(evtlist[selected].channelID ); paint(evtlist[selected].channelID );
showFunctionBar(true, evtlist[selected].channelID ); showFunctionBar(evtlist[selected].channelID );
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
} }
else if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) 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); paintHead(channel_id, channelname);
readEvents(epg_id); readEvents(epg_id);
paint(channel_id); paint(channel_id);
showFunctionBar(true, channel_id); showFunctionBar(channel_id);
} else { } else {
selected = oldselected; selected = oldselected;
if(fader.StartFadeOut()) { if(fader.StartFadeOut()) {
@@ -589,7 +589,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
oldEventID = -1; oldEventID = -1;
bgRightBoxPaint = false; bgRightBoxPaint = false;
paint(channel_id); paint(channel_id);
showFunctionBar(true, channel_id); showFunctionBar(channel_id);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
} }
else if (msg == CRCInput::RC_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; oldEventID = -1;
bgRightBoxPaint = false; bgRightBoxPaint = false;
paint(channel_id); paint(channel_id);
showFunctionBar(true, channel_id); showFunctionBar(channel_id);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); 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 bx = x;
int bw = full_width; int bw = full_width;
int bh = iheight; int bh = iheight;
int by = y + height - bh; int by = y + height - bh;
if (! show) {
// -- hide only?
frameBuffer->paintBackgroundBoxRel(bx,by,bw,bh);
return;
}
CColorKeyHelper keyhelper; //user_menue.h CColorKeyHelper keyhelper; //user_menue.h
neutrino_msg_t dummy = CRCInput::RC_nokey; neutrino_msg_t dummy = CRCInput::RC_nokey;
const char * icon = NULL; const char * icon = NULL;
@@ -1160,7 +1154,7 @@ bool CEventList::findEvents(t_channel_id channel_id, std::string channelname)
else else
paintHead(channel_id, channelname); paintHead(channel_id, channelname);
paint(); paint();
showFunctionBar(true, channel_id); showFunctionBar(channel_id);
return(res); return(res);
} }

2
src/gui/eventlist.h
View File

@@ -114,7 +114,7 @@ class CEventList : public CListHelpers
void paint(t_channel_id channel_id = 0); 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 paintHead(t_channel_id _channel_id, std::string _channelname, std::string _channelname_prev = "", std::string _channelname_next = "");
void hide(); void hide();
void showFunctionBar(bool show, t_channel_id channel_id); void showFunctionBar(t_channel_id channel_id);
int timerPre; int timerPre;
int timerPost; int timerPost;