diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 54c20323c..7689d6918 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1718,28 +1718,28 @@ void CAudioPlayerGui::paintHead() header.paint(CC_SAVE_SCREEN_NO); } +#if 0 +#define BUTTON_LABEL_COUNT 3 +const struct button_label SecondLineButtons[BUTTON_LABEL_COUNT] = +{ + { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_AUDIOPLAYER_PLAY }, + { NEUTRINO_ICON_BUTTON_HELP, LOCALE_AUDIOPLAYER_KEYLEVEL }, + { NEUTRINO_ICON_BUTTON_INFO, LOCALE_PICTUREVIEWER_HEAD } +}; +#else +#define BUTTON_LABEL_COUNT 2 +const struct button_label SecondLineButtons[BUTTON_LABEL_COUNT] = +{ + { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_AUDIOPLAYER_PLAY }, + { NEUTRINO_ICON_BUTTON_HELP, LOCALE_AUDIOPLAYER_KEYLEVEL } +}; +#endif + void CAudioPlayerGui::paintFoot() { if (CScreenSaver::getInstance()->isActive()) return; -#if 0 - int c = 3; - const struct button_label SecondLineButtons[c] = - { - { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_AUDIOPLAYER_PLAY }, - { NEUTRINO_ICON_BUTTON_HELP, LOCALE_AUDIOPLAYER_KEYLEVEL }, - { NEUTRINO_ICON_BUTTON_INFO, LOCALE_PICTUREVIEWER_HEAD } - }; -#else - int c = 2; - const struct button_label SecondLineButtons[c] = - { - { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_AUDIOPLAYER_PLAY }, - { NEUTRINO_ICON_BUTTON_HELP, LOCALE_AUDIOPLAYER_KEYLEVEL } - }; -#endif - int radius = RADIUS_LARGE; int button_y = m_y + m_height - OFFSET_SHADOW - m_info_height - OFFSET_INTER - OFFSET_SHADOW - 2*m_button_height; int button_x = m_x; @@ -1757,7 +1757,7 @@ void CAudioPlayerGui::paintFoot() m_frameBuffer->paintBoxRel(m_x, button_y, m_width, 2*m_button_height, COL_MENUFOOT_PLUS_0, radius, (m_show_playlist ? CORNER_BOTTOM : CORNER_ALL)); if (!m_playlist.empty()) - ::paintButtons(button_x, button_y + m_button_height, button_width, c, SecondLineButtons, button_width, m_button_height); + ::paintButtons(button_x, button_y + m_button_height, button_width, BUTTON_LABEL_COUNT, SecondLineButtons, button_width, m_button_height); if (m_key_level == 0) {