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

audioplayer: avoid start of pictureviewer; this feature seems broken

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: db9fa96c21
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-31 (Fri, 31 Jan 2020)

Origin message was:
------------------
- audioplayer: avoid start of pictureviewer; this feature seems broken

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-01-31 22:20:04 +01:00
parent e6a66bd6ca
commit 1e6f25236e
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/audioplayer.cpp
View File

@@ -785,6 +785,8 @@ int CAudioPlayerGui::show()
} }
} }
} }
#if 0
// FIXME; this seems totally broken
else if (msg == CRCInput::RC_info && !m_playlist.empty()) else if (msg == CRCInput::RC_info && !m_playlist.empty())
{ {
pictureviewer = true; pictureviewer = true;
@@ -802,6 +804,7 @@ int CAudioPlayerGui::show()
paintLCD(); paintLCD();
update = true; update = true;
} }
#endif
else if (msg == CRCInput::RC_help) else if (msg == CRCInput::RC_help)
{ {
if (m_key_level == 2) if (m_key_level == 2)
@@ -1716,12 +1719,22 @@ void CAudioPlayerGui::paintFoot()
if (CScreenSaver::getInstance()->isActive()) if (CScreenSaver::getInstance()->isActive())
return; return;
const struct button_label SecondLineButtons[3] = #if 0
int c = 3;
const struct button_label SecondLineButtons[c] =
{ {
{ NEUTRINO_ICON_BUTTON_OKAY, LOCALE_AUDIOPLAYER_PLAY }, { NEUTRINO_ICON_BUTTON_OKAY, LOCALE_AUDIOPLAYER_PLAY },
{ NEUTRINO_ICON_BUTTON_HELP, LOCALE_AUDIOPLAYER_KEYLEVEL }, { NEUTRINO_ICON_BUTTON_HELP, LOCALE_AUDIOPLAYER_KEYLEVEL },
{ NEUTRINO_ICON_BUTTON_INFO, LOCALE_PICTUREVIEWER_HEAD } { 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 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_y = m_y + m_height - OFFSET_SHADOW - m_info_height - OFFSET_INTER - OFFSET_SHADOW - 2*m_button_height;
@@ -1740,7 +1753,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)); 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()) if (!m_playlist.empty())
::paintButtons(button_x, button_y + m_button_height, button_width, 3, SecondLineButtons, button_width, m_button_height); ::paintButtons(button_x, button_y + m_button_height, button_width, c, SecondLineButtons, button_width, m_button_height);
if (m_key_level == 0) if (m_key_level == 0)
{ {