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

CInfoViewer: use binary operators for zap mode statements

Browse Source
This commit is contained in:
Thilo Graf
2016-02-19 09:27:54 +01:00
parent 2d209a90d7
commit f75402e571
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/infoviewer.cpp
View File

@@ -693,13 +693,14 @@ void CInfoViewer::showTitle(t_channel_id chid, const bool calledFromNumZap, int
void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap, int epgpos) void CInfoViewer::showTitle(CZapitChannel * channel, const bool calledFromNumZap, int epgpos)
{ {
if(!calledFromNumZap && zap_mode != IV_MODE_DEFAULT) if(!calledFromNumZap && !(zap_mode & IV_MODE_DEFAULT))
resetSwitchMode(); resetSwitchMode();
std::string Channel = channel->getName(); std::string Channel = channel->getName();
t_satellite_position satellitePosition = channel->getSatellitePosition(); t_satellite_position satellitePosition = channel->getSatellitePosition();
t_channel_id new_channel_id = channel->getChannelID(); t_channel_id new_channel_id = channel->getChannelID();
int ChanNum = channel->number; int ChanNum = channel->number;
current_epg_id = channel->getEpgID(); current_epg_id = channel->getEpgID();
if (g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_LEFT || if (g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_LEFT ||
@@ -2059,7 +2060,7 @@ void CInfoViewer::killTitle()
rec->kill(); rec->kill();
//printf("killTitle(%d, %d, %d, %d)\n", BoxStartX, BoxStartY, BoxEndX+ SHADOW_OFFSET-BoxStartX, bottom-BoxStartY); //printf("killTitle(%d, %d, %d, %d)\n", BoxStartX, BoxStartY, BoxEndX+ SHADOW_OFFSET-BoxStartX, bottom-BoxStartY);
//frameBuffer->paintBackgroundBox(BoxStartX, BoxStartY, BoxEndX+ SHADOW_OFFSET, bottom); //frameBuffer->paintBackgroundBox(BoxStartX, BoxStartY, BoxEndX+ SHADOW_OFFSET, bottom);
if (zap_mode != IV_MODE_VIRTUAL_ZAP){ if (!(zap_mode & IV_MODE_VIRTUAL_ZAP)){
if (infobar_txt) if (infobar_txt)
infobar_txt->kill(); infobar_txt->kill();
numbox->kill(); numbox->kill();