infoviewer_bb: outsource init of volscale

partial clean up
This commit is contained in:
2022-04-07 12:06:03 +02:00
parent 7f4fcddd9a
commit e33b61f52d
2 changed files with 14 additions and 7 deletions

View File

@@ -349,13 +349,8 @@ void CInfoViewerBB::getBBButtonInfo()
} }
} }
void CInfoViewerBB::showBBButtons(bool paintFooter) void CInfoViewerBB::initVolscale()
{ {
if (!is_visible)
return;
int i;
bool paint = false;
if (g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_LEFT || if (g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_LEFT ||
g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_RIGHT || g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_RIGHT ||
g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_CENTER || g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_BOTTOM_CENTER ||
@@ -363,6 +358,16 @@ void CInfoViewerBB::showBBButtons(bool paintFooter)
g_InfoViewer->isVolscale = CVolume::getInstance()->hideVolscale(); g_InfoViewer->isVolscale = CVolume::getInstance()->hideVolscale();
else else
g_InfoViewer->isVolscale = false; g_InfoViewer->isVolscale = false;
}
void CInfoViewerBB::showBBButtons(bool paintFooter)
{
if (!is_visible)
return;
int i;
bool paint = false;
initVolscale();
getBBButtonInfo(); getBBButtonInfo();
for (i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) { for (i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) {

View File

@@ -120,6 +120,8 @@ class CInfoViewerBB
void showBarSys(int percent = 0); void showBarSys(int percent = 0);
void showBarHdd(int percent = 0); void showBarHdd(int percent = 0);
void initVolscale();
CInfoViewerBB(); CInfoViewerBB();
public: public: