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

channelist: rename bool pig_on_win to minitv_is_active

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 42aca4a4c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channelist: rename bool pig_on_win to minitv_is_active

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-04-12 10:04:04 +02:00
parent cd40e9c6a7
commit 09237ad821
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/channellist.cpp
View File

@@ -125,7 +125,7 @@ CChannelList::CChannelList(const char * const pName, bool phistoryMode, bool _vl
dline = NULL; dline = NULL;
cc_minitv = NULL; cc_minitv = NULL;
logo_off = 0; logo_off = 0;
pig_on_win = false; minitv_is_active = false;
CChannelLogo = NULL; CChannelLogo = NULL;
headerNew = true; headerNew = true;
bouquet = NULL; bouquet = NULL;
@@ -484,9 +484,9 @@ void CChannelList::calcSize()
fheight = 1; /* avoid div-by-zero crash on invalid font */ fheight = 1; /* avoid div-by-zero crash on invalid font */
footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()+6; footerHeight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_FOOT]->getHeight()+6;
pig_on_win = ( (g_settings.channellist_additional == 2) /* with miniTV */ && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) ); minitv_is_active = ( (g_settings.channellist_additional == 2) && (CNeutrinoApp::getInstance()->getMode() != NeutrinoMessages::mode_ts) );
// calculate width // calculate width
full_width = pig_on_win ? (frameBuffer->getScreenWidth()-2*DETAILSLINE_WIDTH) : frameBuffer->getScreenWidthRel(); full_width = minitv_is_active ? (frameBuffer->getScreenWidth()-2*DETAILSLINE_WIDTH) : frameBuffer->getScreenWidthRel();
if (g_settings.channellist_additional) if (g_settings.channellist_additional)
width = full_width / 3 * 2; width = full_width / 3 * 2;
@@ -498,7 +498,7 @@ void CChannelList::calcSize()
info_height = 2*fheight + fdescrheight + 2*OFFSET_INNER_SMALL; info_height = 2*fheight + fdescrheight + 2*OFFSET_INNER_SMALL;
else else
info_height = 0; info_height = 0;
height = pig_on_win ? frameBuffer->getScreenHeight(): frameBuffer->getScreenHeightRel(); height = minitv_is_active ? frameBuffer->getScreenHeight() : frameBuffer->getScreenHeightRel();
height = height - OFFSET_INTER - info_height; height = height - OFFSET_INTER - info_height;
// calculate x position // calculate x position
@@ -522,7 +522,7 @@ void CChannelList::calcSize()
// calculate width/height of right info_zone and pip-box // calculate width/height of right info_zone and pip-box
infozone_width = full_width - width; infozone_width = full_width - width;
pig_width = infozone_width; pig_width = infozone_width;
if ( pig_on_win /* with miniTV */ ) if (minitv_is_active)
pig_height = (pig_width * 9) / 16; pig_height = (pig_width * 9) / 16;
else else
pig_height = 0; pig_height = 0;
@@ -2210,7 +2210,7 @@ void CChannelList::paintBody()
liststart = (selected/listmaxshow)*listmaxshow; liststart = (selected/listmaxshow)*listmaxshow;
updateEvents(this->historyMode ? 0:liststart, this->historyMode ? 0:(liststart + listmaxshow)); updateEvents(this->historyMode ? 0:liststart, this->historyMode ? 0:(liststart + listmaxshow));
if (pig_on_win) // with miniTV if (minitv_is_active)
paintPig(x+width, y+theight, pig_width, pig_height); paintPig(x+width, y+theight, pig_width, pig_height);
// paint background for main box // paint background for main box
@@ -2301,7 +2301,7 @@ std::string CChannelList::MaxChanNr()
return to_string(n); return to_string(n);
} }
void CChannelList::paintPig (int _x, int _y, int w, int h) void CChannelList::paintPig(int _x, int _y, int w, int h)
{ {
//init minitv object with basic properties //init minitv object with basic properties
if (cc_minitv == NULL){ if (cc_minitv == NULL){

2
src/gui/channellist.h
View File

@@ -131,7 +131,7 @@ private:
bool vlist; // "virtual" list, not bouquet bool vlist; // "virtual" list, not bouquet
bool displayNext; bool displayNext;
bool displayList; bool displayList;
bool pig_on_win; bool minitv_is_active;
bool headerNew; bool headerNew;