From e33b61f52d6115697a31475b3a040914052f781c Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Thu, 7 Apr 2022 12:06:03 +0200
Subject: [PATCH] infoviewer_bb: outsource init of volscale

partial clean up
---
 src/gui/infoviewer_bb.cpp | 19 ++++++++++++-------
 src/gui/infoviewer_bb.h   |  2 ++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp
index b638b0182..66ca33b45 100644
--- a/src/gui/infoviewer_bb.cpp
+++ b/src/gui/infoviewer_bb.cpp
@@ -349,6 +349,17 @@ void CInfoViewerBB::getBBButtonInfo()
 	}
 }
 
+void CInfoViewerBB::initVolscale()
+{
+	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_CENTER ||
+		g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_HIGHER_CENTER)
+		g_InfoViewer->isVolscale = CVolume::getInstance()->hideVolscale();
+	else
+		g_InfoViewer->isVolscale = false;
+}
+
 void CInfoViewerBB::showBBButtons(bool paintFooter)
 {
 	if (!is_visible)
@@ -356,13 +367,7 @@ void CInfoViewerBB::showBBButtons(bool paintFooter)
 	int i;
 	bool paint = false;
 
-	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_CENTER || 
-	    g_settings.volume_pos == CVolumeBar::VOLUMEBAR_POS_HIGHER_CENTER)
-		g_InfoViewer->isVolscale = CVolume::getInstance()->hideVolscale();
-	else
-		g_InfoViewer->isVolscale = false;
+	initVolscale();
 
 	getBBButtonInfo();
 	for (i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) {
diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h
index d9064a6cb..080f68f9d 100644
--- a/src/gui/infoviewer_bb.h
+++ b/src/gui/infoviewer_bb.h
@@ -120,6 +120,8 @@ class CInfoViewerBB
 		void showBarSys(int percent = 0);
 		void showBarHdd(int percent = 0);
 
+		void initVolscale();
+
 		CInfoViewerBB();
 
 	public: