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

volumebar: formatting code using astyle; some manual code nicenings

Browse Source 
Origin commit data
------------------
Commit: e36272f4ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-12-04 (Sat, 04 Dec 2021)

Origin message was:
------------------
- volumebar: formatting code using astyle; some manual code nicenings
This commit is contained in:
vanhofen
2021-12-04 23:22:35 +01:00
parent a2b5dc36dc
commit 4bc2e4c163
2 changed files with 128 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
src/gui/volumebar.cpp
View File

@@ -42,7 +42,6 @@ extern CTimeOSD *FileTimeOSD;
using namespace std; using namespace std;
CVolumeBar::CVolumeBar() CVolumeBar::CVolumeBar()
{ {
initVarVolumeBar(); initVarVolumeBar();
@@ -50,37 +49,37 @@ CVolumeBar::CVolumeBar()
void CVolumeBar::initVarVolumeBar() void CVolumeBar::initVarVolumeBar()
{ {
col_body_std = COL_MENUCONTENT_PLUS_0; col_body_std = COL_MENUCONTENT_PLUS_0;
corner_rad = g_settings.theme.rounded_corners ? CORNER_RADIUS_MID : CORNER_RADIUS_NONE; corner_rad = g_settings.theme.rounded_corners ? CORNER_RADIUS_MID : CORNER_RADIUS_NONE;
vb_item_offset = OFFSET_INNER_SMALL; vb_item_offset = OFFSET_INNER_SMALL;
height = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size); height = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size);
//assume volume value as pointer to global setting // assume volume value as pointer to global setting
vb_vol = &g_settings.current_volume; vb_vol = &g_settings.current_volume;
//items // items
//icon object // icon object
vb_icon = NULL; vb_icon = NULL;
//progressbar object // progressbar object
vb_pb = NULL; vb_pb = NULL;
vb_pbx = 0; vb_pbx = 0;
vb_pbw = 0; vb_pbw = 0;
vb_pbh = 0; vb_pbh = 0;
vb_pby = 0; vb_pby = 0;
//digit // digit
vb_digit = NULL; vb_digit = NULL;
vb_digit_mode = CTextBox::CENTER ; vb_digit_mode = CTextBox::CENTER ;
VolumeFont = SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO; VolumeFont = SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO;
initVolumeBarSize(); initVolumeBarSize();
initVolumeBarPosition(); initVolumeBarPosition();
initVolumeBarItems(); initVolumeBarItems();
} }
//calculates size referred for possible activated clock or/and mute icon // calculates size referred for possible activated clock or/and mute icon
void CVolumeBar::initVolumeBarSize() void CVolumeBar::initVolumeBarSize()
{ {
CVolumeHelper *cvh = CVolumeHelper::getInstance(); CVolumeHelper *cvh = CVolumeHelper::getInstance();
@@ -92,19 +91,19 @@ void CVolumeBar::initVolumeBarSize()
//if (g_settings.theme.rounded_corners) //if (g_settings.theme.rounded_corners)
// vb_digit_w += corner_rad/2; // vb_digit_w += corner_rad/2;
//scale // scale
vb_pbw = CFrameBuffer::getInstance()->scale2Res(200); vb_pbw = CFrameBuffer::getInstance()->scale2Res(200);
vb_pbh = height-2*vb_item_offset; vb_pbh = height - 2 * vb_item_offset;
//result for width // result for width
width = (vb_icon_w + vb_pbw + vb_digit_w) + 4*vb_item_offset; width = (vb_icon_w + vb_pbw + vb_digit_w) + 4 * vb_item_offset;
if (g_settings.theme.rounded_corners) if (g_settings.theme.rounded_corners)
width += corner_rad/2; width += corner_rad / 2;
//adapt x-pos // adapt x-pos
vb_pbx = vb_item_offset + vb_icon_w + vb_item_offset; vb_pbx = vb_item_offset + vb_icon_w + vb_item_offset;
vb_icon_x = vb_pbx/2 - vb_icon_w/2 + vb_item_offset; vb_icon_x = vb_pbx / 2 - vb_icon_w / 2 + vb_item_offset;
vb_digit_x = vb_pbx + vb_pbw + vb_item_offset; vb_digit_x = vb_pbx + vb_pbw + vb_item_offset;
// mute icon // mute icon
cvh->getMuteIconDimensions(&mute_ax, &mute_ay, &mute_dx, &mute_dy); cvh->getMuteIconDimensions(&mute_ax, &mute_ay, &mute_dx, &mute_dy);
@@ -116,19 +115,21 @@ void CVolumeBar::initVolumeBarSize()
mute_corrY = (height - mute_dy) / 2; mute_corrY = (height - mute_dy) / 2;
cvh->setMuteIconCorrY(mute_corrY); cvh->setMuteIconCorrY(mute_corrY);
vb_pby = height/2-vb_pbh/2; vb_pby = height / 2 - vb_pbh / 2;
} }
//init current position of form // init current position of form
void CVolumeBar::initVolumeBarPosition() void CVolumeBar::initVolumeBarPosition()
{ {
CNeutrinoApp* neutrino = CNeutrinoApp::getInstance(); CNeutrinoApp *neutrino = CNeutrinoApp::getInstance();
switch (g_settings.volume_pos) switch (g_settings.volume_pos)
{ {
case VOLUMEBAR_POS_TOP_RIGHT:{ case VOLUMEBAR_POS_TOP_RIGHT:
int x_corr = 0; {
if ((neutrino->getMode() != NeutrinoModes::mode_avinput) && (neutrino->getMode() != NeutrinoModes::mode_audio) && (neutrino->getMode() != NeutrinoModes::mode_pic)) { int x_corr = 0;
if ((neutrino->getMode() != NeutrinoModes::mode_avinput) && (neutrino->getMode() != NeutrinoModes::mode_audio) && (neutrino->getMode() != NeutrinoModes::mode_pic))
{
if ((neutrino->isMuted()) && (!g_settings.mode_clock)) if ((neutrino->isMuted()) && (!g_settings.mode_clock))
x_corr = mute_dx + h_spacer; x_corr = mute_dx + h_spacer;
if (CNeutrinoApp::getInstance()->getChannellistIsVisible() == true) if (CNeutrinoApp::getInstance()->getChannellistIsVisible() == true)
@@ -151,38 +152,39 @@ void CVolumeBar::initVolumeBarPosition()
y = (sh + frameBuffer->getScreenY()) - height - v_spacer; y = (sh + frameBuffer->getScreenY()) - height - v_spacer;
break; break;
case VOLUMEBAR_POS_TOP_CENTER: case VOLUMEBAR_POS_TOP_CENTER:
x = ((sw - width) / 2) + x - h_spacer/2; x = ((sw - width) / 2) + x - h_spacer / 2;
break; break;
case VOLUMEBAR_POS_BOTTOM_CENTER: case VOLUMEBAR_POS_BOTTOM_CENTER:
x = ((sw - width) / 2) + x - h_spacer/2; x = ((sw - width) / 2) + x - h_spacer / 2;
y = (sh + frameBuffer->getScreenY()) - height - v_spacer; y = (sh + frameBuffer->getScreenY()) - height - v_spacer;
break; break;
case VOLUMEBAR_POS_HIGHER_CENTER: case VOLUMEBAR_POS_HIGHER_CENTER:
x = ((sw - width) / 2) + x - h_spacer/2; x = ((sw - width) / 2) + x - h_spacer / 2;
y = (sh + frameBuffer->getScreenY()) - sh/10; y = (sh + frameBuffer->getScreenY()) - sh / 10;
break; break;
} }
} }
void CVolumeBar::initVolumeBarItems() void CVolumeBar::initVolumeBarItems()
{ {
//icon // icon
initVolumeBarIcon(); initVolumeBarIcon();
//scale // scale
initVolumeBarScale(); initVolumeBarScale();
//digits // digits
if (g_settings.volume_digits) if (g_settings.volume_digits)
initVolumeBarDigit(); initVolumeBarDigit();
} }
//init current icon object // init current icon object
void CVolumeBar::initVolumeBarIcon() void CVolumeBar::initVolumeBarIcon()
{ {
if (!vb_icon){ if (!vb_icon)
{
vb_icon = new CComponentsPicture(vb_icon_x, CC_CENTERED, vb_icon_w, height, NEUTRINO_ICON_VOLUME); vb_icon = new CComponentsPicture(vb_icon_x, CC_CENTERED, vb_icon_w, height, NEUTRINO_ICON_VOLUME);
//add icon to container // add icon to container
addCCItem(vb_icon); addCCItem(vb_icon);
} }
@@ -191,12 +193,13 @@ void CVolumeBar::initVolumeBarIcon()
vb_icon->setCorner(corner_rad, CORNER_LEFT); vb_icon->setCorner(corner_rad, CORNER_LEFT);
} }
//create new scale // create new scale
void CVolumeBar::initVolumeBarScale() void CVolumeBar::initVolumeBarScale()
{ {
if (!vb_pb){ if (!vb_pb)
{
vb_pb = new CProgressBar(); vb_pb = new CProgressBar();
//add progressbar to container // add progressbar to container
addCCItem(vb_pb); addCCItem(vb_pb);
} }
@@ -206,14 +209,14 @@ void CVolumeBar::initVolumeBarScale()
vb_pb->setProgress(vb_pbx, vb_pby, vb_pbw, vb_pbh, *vb_vol, 100); vb_pb->setProgress(vb_pbx, vb_pby, vb_pbw, vb_pbh, *vb_vol, 100);
} }
//set digit text with current volume value // set digit text with current volume value
void CVolumeBar::initVolumeBarDigitValue() void CVolumeBar::initVolumeBarDigitValue()
{ {
vb_digit->kill(col_body_std); vb_digit->kill(col_body_std);
vb_digit->setText(*vb_vol ,vb_digit_mode, *(CVolumeHelper::getInstance()->vb_font)); vb_digit->setText(*vb_vol, vb_digit_mode, *(CVolumeHelper::getInstance()->vb_font));
} }
//create digit // create digit
void CVolumeBar::initVolumeBarDigit() void CVolumeBar::initVolumeBarDigit()
{ {
if (!vb_digit) if (!vb_digit)
@@ -225,26 +228,26 @@ void CVolumeBar::initVolumeBarDigit()
initVolumeBarDigitValue(); initVolumeBarDigitValue();
} }
//refresh and paint digit // refresh and paint digit
void CVolumeBar::paintVolumeBarDigit() void CVolumeBar::paintVolumeBarDigit()
{ {
// paint digit // paint digit
vb_digit->paint(CC_SAVE_SCREEN_NO); vb_digit->paint(CC_SAVE_SCREEN_NO);
} }
// refresh progressbar and digit
//refresh progressbar and digit
void CVolumeBar::repaintVolScale() void CVolumeBar::repaintVolScale()
{ {
paintVolScale(); paintVolScale();
if (g_settings.volume_digits) { if (g_settings.volume_digits)
{
initVolumeBarDigitValue(); initVolumeBarDigitValue();
paintVolumeBarDigit(); paintVolumeBarDigit();
} }
} }
//set current volume value and paint form // set current volume value and paint form
void CVolumeBar::paintVolScale() void CVolumeBar::paintVolScale()
{ {
vb_pb->setValue(*vb_vol); vb_pb->setValue(*vb_vol);
@@ -253,19 +256,17 @@ void CVolumeBar::paintVolScale()
void CVolumeBar::paint(const bool &do_save_bg) void CVolumeBar::paint(const bool &do_save_bg)
{ {
//prepare items // prepare items
initVolumeBarItems(); initVolumeBarItems();
//paint form contents // paint form contents
if (!is_painted) if (!is_painted)
CComponentsForm::paint(do_save_bg); CComponentsForm::paint(do_save_bg);
else else
repaintVolScale(); repaintVolScale();
} }
// CVolumeHelper ##############################################################
// CVolumeHelper ####################################################################################################
CVolumeHelper::CVolumeHelper() CVolumeHelper::CVolumeHelper()
{ {
@@ -283,21 +284,23 @@ CVolumeHelper::CVolumeHelper()
void CVolumeHelper::resetFont() void CVolumeHelper::resetFont()
{ {
if (vb_font){ if (vb_font)
vb_font = NULL; {
vb_font = NULL;
dprintf(DEBUG_INFO, "\033[33m[CVolumeHelper][%s - %d] reset vb font \033[0m\n", __func__, __LINE__); dprintf(DEBUG_INFO, "\033[33m[CVolumeHelper][%s - %d] reset vb font \033[0m\n", __func__, __LINE__);
} }
if (clock_font){ if (clock_font)
clock_font = NULL; {
clock_font = NULL;
dprintf(DEBUG_INFO, "\033[33m[CVolumeHelper][%s - %d] reset clock font \033[0m\n", __func__, __LINE__); dprintf(DEBUG_INFO, "\033[33m[CVolumeHelper][%s - %d] reset clock font \033[0m\n", __func__, __LINE__);
} }
} }
void CVolumeHelper::Init(Font* font) void CVolumeHelper::Init(Font *font)
{ {
x = frameBuffer->getScreenX() + h_spacer; x = frameBuffer->getScreenX() + h_spacer;
y = frameBuffer->getScreenY() + v_spacer; y = frameBuffer->getScreenY() + v_spacer;
sw = g_settings.screen_EndX - h_spacer; sw = g_settings.screen_EndX - h_spacer;
sh = frameBuffer->getScreenHeight(); sh = frameBuffer->getScreenHeight();
@@ -306,9 +309,10 @@ void CVolumeHelper::Init(Font* font)
initInfoClock(font); initInfoClock(font);
} }
void CVolumeHelper::initInfoClock(Font* font) void CVolumeHelper::initInfoClock(Font *font)
{ {
if (font == NULL) { if (font == NULL)
{
int dx = 0; int dx = 0;
int dy = g_settings.infoClockFontSize; int dy = g_settings.infoClockFontSize;
clock_font = *CNeutrinoFonts::getInstance()->getDynFont(dx, dy, g_settings.infoClockSeconds ? "%H:%M:%S" : "%H:%M"); clock_font = *CNeutrinoFonts::getInstance()->getDynFont(dx, dy, g_settings.infoClockSeconds ? "%H:%M:%S" : "%H:%M");
@@ -317,63 +321,66 @@ void CVolumeHelper::initInfoClock(Font* font)
clock_font = font; clock_font = font;
digit_offset = (clock_font)->getDigitOffset(); digit_offset = (clock_font)->getDigitOffset();
digit_h = (clock_font)->getDigitHeight(); digit_h = (clock_font)->getDigitHeight();
int t1 = (clock_font)->getMaxDigitWidth(); int t1 = (clock_font)->getMaxDigitWidth();
int t2 = (clock_font)->getRenderWidth(":"); int t2 = (clock_font)->getRenderWidth(":");
clock_dy = digit_h + (int)((float)digit_offset * 1.3); clock_dy = digit_h + (int)((float)digit_offset * 1.3);
if (g_settings.infoClockSeconds) if (g_settings.infoClockSeconds)
clock_dx = t1*7 + t2*2; clock_dx = t1 * 7 + t2 * 2;
else else
clock_dx = t1*5 + t2*1; clock_dx = t1 * 5 + t2 * 1;
clock_ax = sw - clock_dx; clock_ax = sw - clock_dx;
clock_ay = y; clock_ay = y;
vol_ay = y; vol_ay = y;
mute_corrY = 0; mute_corrY = 0;
if (g_settings.mode_clock) { if (g_settings.mode_clock)
{
if (mute_dy > clock_dy) if (mute_dy > clock_dy)
clock_ay += (mute_dy - clock_dy) / 2; clock_ay += (mute_dy - clock_dy) / 2;
else else
mute_corrY = (clock_dy - mute_dy) / 2; mute_corrY = (clock_dy - mute_dy) / 2;
} }
else { else
{
if (mute_dy > vol_height) if (mute_dy > vol_height)
vol_ay += (mute_dy - vol_height) / 2; vol_ay += (mute_dy - vol_height) / 2;
else else
mute_corrY = (vol_height - mute_dy) / 2; mute_corrY = (vol_height - mute_dy) / 2;
} }
time_dx = t1*7 + t2*2; time_dx = t1 * 7 + t2 * 2;
time_ax = frameBuffer->getScreenX() + h_spacer; time_ax = frameBuffer->getScreenX() + h_spacer;
} }
void CVolumeHelper::initMuteIcon() void CVolumeHelper::initMuteIcon()
{ {
frameBuffer->getIconSize(NEUTRINO_ICON_MUTED, &mute_dx, &mute_dy); frameBuffer->getIconSize(NEUTRINO_ICON_MUTED, &mute_dx, &mute_dy);
mute_ax = sw - mute_dx; mute_ax = sw - mute_dx;
mute_ay = y; mute_ay = y;
} }
void CVolumeHelper::initVolBarSize() void CVolumeHelper::initVolBarSize()
{ {
icon_width = 0; icon_width = 0;
icon_height = 0; icon_height = 0;
digit_width = 0; digit_width = 0;
frameBuffer->getIconSize(NEUTRINO_ICON_VOLUME, &icon_width, &icon_height); frameBuffer->getIconSize(NEUTRINO_ICON_VOLUME, &icon_width, &icon_height);
icon_height = max(icon_height, 16); // if no icon available icon_height = max(icon_height, 16); // if no icon available
icon_height += OFFSET_INNER_MIN; icon_height += OFFSET_INNER_MIN;
icon_width += OFFSET_INNER_MID; icon_width += OFFSET_INNER_MID;
g_settings.volume_size = max(g_settings.volume_size, icon_height); g_settings.volume_size = max(g_settings.volume_size, icon_height);
vol_height = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size); vol_height = CFrameBuffer::getInstance()->scale2Res(g_settings.volume_size);
if (g_settings.volume_digits) { if (g_settings.volume_digits)
{
CNeutrinoFonts *cnf = CNeutrinoFonts::getInstance(); CNeutrinoFonts *cnf = CNeutrinoFonts::getInstance();
cnf->setFontUseDigitHeight(true); cnf->setFontUseDigitHeight(true);
int tmp_h = vol_height; int tmp_h = vol_height;
digit_width = 0; digit_width = 0;
vb_font = cnf->getDynFont(digit_width, tmp_h, "100", CNeutrinoFonts::FONT_STYLE_REGULAR, CNeutrinoFonts::FONT_ID_VOLBAR); vb_font = cnf->getDynFont(digit_width, tmp_h, "100", CNeutrinoFonts::FONT_STYLE_REGULAR, CNeutrinoFonts::FONT_ID_VOLBAR);
digit_width += OFFSET_INNER_SMALL; digit_width += OFFSET_INNER_SMALL;
vol_height = max(vol_height, tmp_h); vol_height = max(vol_height, tmp_h);
} }
} }
@@ -385,15 +392,15 @@ int CVolumeHelper::getInfoClockX()
return clock_ax; return clock_ax;
} }
void CVolumeHelper::refresh(Font* font) void CVolumeHelper::refresh(Font *font)
{ {
Init(font); Init(font);
} }
CVolumeHelper* CVolumeHelper::getInstance() CVolumeHelper *CVolumeHelper::getInstance()
{ {
static CVolumeHelper* Helper = NULL; static CVolumeHelper *Helper = NULL;
if(!Helper) if (!Helper)
Helper = new CVolumeHelper(); Helper = new CVolumeHelper();
return Helper; return Helper;
} }

33
src/gui/volumebar.h
View File

@@ -44,19 +44,19 @@ class CVolumeBar : public CComponentsForm
int h_spacer, v_spacer; int h_spacer, v_spacer;
int vb_item_offset; int vb_item_offset;
//clock // clock
int clock_y, clock_width, clock_height; int clock_y, clock_width, clock_height;
//volume value // volume value
char *vb_vol; char *vb_vol;
//scale dimensions // scale dimensions
int vb_pbx, vb_pby, vb_pbw, vb_pbh; int vb_pbx, vb_pby, vb_pbw, vb_pbh;
//icon dimensions // icon dimensions
int vb_icon_x, vb_icon_w/*, vb_icon_h*/; int vb_icon_x, vb_icon_w/*, vb_icon_h*/;
//digit dimensions // digit dimensions
int vb_digit_x, vb_digit_w/*, vb_digit_h*/; int vb_digit_x, vb_digit_w/*, vb_digit_h*/;
void initVarVolumeBar(); void initVarVolumeBar();
@@ -82,17 +82,16 @@ class CVolumeBar : public CComponentsForm
VOLUMEBAR_POS_BOTTOM_RIGHT = 3, VOLUMEBAR_POS_BOTTOM_RIGHT = 3,
VOLUMEBAR_POS_TOP_CENTER = 4, VOLUMEBAR_POS_TOP_CENTER = 4,
VOLUMEBAR_POS_BOTTOM_CENTER = 5, VOLUMEBAR_POS_BOTTOM_CENTER = 5,
VOLUMEBAR_POS_HIGHER_CENTER = 6 VOLUMEBAR_POS_HIGHER_CENTER = 6
}; };
CVolumeBar(/*int current_volume*/); CVolumeBar(/*int current_volume*/);
// ~CVolumeBar(); inherited from CComponentsForm //~CVolumeBar(); // inherited from CComponentsForm
void repaintVolScale(); void repaintVolScale();
void paint(const bool &do_save_bg = CC_SAVE_SCREEN_YES); void paint(const bool &do_save_bg = CC_SAVE_SCREEN_YES);
}; };
class CVolumeHelper class CVolumeHelper
{ {
private: private:
@@ -103,32 +102,32 @@ class CVolumeHelper
int icon_width, icon_height, digit_width; int icon_width, icon_height, digit_width;
int h_spacer, v_spacer; int h_spacer, v_spacer;
int vol_ay, vol_height; int vol_ay, vol_height;
Font* clock_font; Font *clock_font;
CFrameBuffer *frameBuffer; CFrameBuffer *frameBuffer;
void resetFont(); void resetFont();
void Init(Font* font=NULL); void Init(Font *font = NULL);
void initVolBarSize(); void initVolBarSize();
void initMuteIcon(); void initMuteIcon();
void initInfoClock(Font* font); void initInfoClock(Font *font);
public: public:
CVolumeHelper(); CVolumeHelper();
static CVolumeHelper* getInstance(); static CVolumeHelper *getInstance();
Font** vb_font; Font **vb_font;
void getSpacer(int *h, int *v) { *h = h_spacer; *v = v_spacer; } void getSpacer(int *h, int *v) { *h = h_spacer; *v = v_spacer; }
int getVolIconHeight() {return icon_height;} int getVolIconHeight() {return icon_height;}
void getDimensions(int *_x, int *_y, int *_sw, int *_sh, int *_iw, int *_dw) { *_x = x; *_y = y; *_sw = sw; *_sh = sh; *_iw = icon_width; *_dw = digit_width; } void getDimensions(int *_x, int *_y, int *_sw, int *_sh, int *_iw, int *_dw) { *_x = x; *_y = y; *_sw = sw; *_sh = sh; *_iw = icon_width; *_dw = digit_width; }
void getMuteIconDimensions(int *_x, int *_y, int *w, int *h) { *_x = mute_ax; *_y = mute_ay+mute_corrY; *w = mute_dx; *h = mute_dy; } void getMuteIconDimensions(int *_x, int *_y, int *w, int *h) { *_x = mute_ax; *_y = mute_ay + mute_corrY; *w = mute_dx; *h = mute_dy; }
int getInfoClockX(); int getInfoClockX();
void getInfoClockDimensions(int *_x, int *_y, int *w, int *h) { *_x = getInfoClockX(); *_y = clock_ay; *w = clock_dx; *h = clock_dy; } void getInfoClockDimensions(int *_x, int *_y, int *w, int *h) { *_x = getInfoClockX(); *_y = clock_ay; *w = clock_dx; *h = clock_dy; }
void getTimeDimensions(int *_x, int *_y, int *w, int *h) { *_x = time_ax; *_y = clock_ay; *w = time_dx; *h = clock_dy; } void getTimeDimensions(int *_x, int *_y, int *w, int *h) { *_x = time_ax; *_y = clock_ay; *w = time_dx; *h = clock_dy; }
void getVolBarDimensions(int *_y, int *_dy) { *_y = vol_ay; *_dy = vol_height; } void getVolBarDimensions(int *_y, int *_dy) { *_y = vol_ay; *_dy = vol_height; }
void setMuteIconCorrY(int corr) { mute_corrY = corr; } void setMuteIconCorrY(int corr) { mute_corrY = corr; }
void refresh(Font* font=NULL); void refresh(Font *font = NULL);
}; };
#endif #endif