mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/next-cc'

Browse Source 
Compiles on most platforms, starts. Not really tested.
This commit is contained in:
Stefan Seyfried
2013-11-10 16:55:53 +01:00
parent 23d8cc6434 1e8764be2e
commit b93a372b54
114 changed files with 7292 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/audioplayer.cpp
View File

@@ -58,7 +58,7 @@
#include <gui/nfs.h>
#endif
#include <gui/components/cc_frm.h>
#include <gui/components/cc.h>
#include <gui/widget/buttons.h>
#include <gui/widget/icons.h>
#include <gui/widget/messagebox.h>
@@ -282,8 +282,6 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
m_fheight = g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->getHeight();
int iw, ih;
m_frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE, &iw, &ih);
m_theight = std::max(m_theight, ih+2);
m_frameBuffer->getIconSize(NEUTRINO_ICON_MP3, &iw, &ih);
m_theight = std::max(m_theight, ih+4);
@@ -614,7 +612,7 @@ int CAudioPlayerGui::show()
if (m_key_level == 1)
stop();
}
else if (msg == CRCInput::RC_green)
else if ((msg == CRCInput::RC_rewind) || (msg == CRCInput::RC_green))
{
if (m_key_level == 0)
{
@@ -656,7 +654,7 @@ int CAudioPlayerGui::show()
}
}
}
else if (msg == CRCInput::RC_yellow)
else if ((msg == CRCInput::RC_pause) || (msg == CRCInput::RC_yellow))
{
if (m_key_level == 0)
{
@@ -680,7 +678,7 @@ int CAudioPlayerGui::show()
paint();
}
}
else if (msg == CRCInput::RC_blue)
else if ((msg == CRCInput::RC_forward) || (msg == CRCInput::RC_blue))
{
if (m_key_level == 0)
{
@@ -902,8 +900,6 @@ int CAudioPlayerGui::show()
ret = menu_return::RETURN_EXIT_ALL;
loop = false;
}
// update mute icon
paintHead();
paintLCD();
}
}
@@ -1646,14 +1642,11 @@ void CAudioPlayerGui::paintHead()
return;
CComponentsHeader header(m_x, m_y + m_title_height, m_width, m_theight, LOCALE_AUDIOPLAYER_HEAD, NEUTRINO_ICON_MP3);
header.setCorner(RADIUS_MID);
header.setCorner(RADIUS_MID, CORNER_TOP);
if (m_inetmode)
header.setCaption(LOCALE_INETRADIO_NAME);
if (CNeutrinoApp::getInstance()->isMuted())
header.addButtonIcon(NEUTRINO_ICON_BUTTON_MUTE_SMALL);
#ifdef ENABLE_GUI_MOUNT
if (!m_inetmode)
header.addButtonIcon(NEUTRINO_ICON_BUTTON_MENU);
@@ -1666,10 +1659,10 @@ void CAudioPlayerGui::paintHead()
const struct button_label AudioPlayerButtons[][4] =
{
{
{ NEUTRINO_ICON_BUTTON_RED , LOCALE_AUDIOPLAYER_STOP },
{ NEUTRINO_ICON_BUTTON_GREEN , LOCALE_AUDIOPLAYER_REWIND },
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_AUDIOPLAYER_PAUSE },
{ NEUTRINO_ICON_BUTTON_BLUE , LOCALE_AUDIOPLAYER_FASTFORWARD },
{ NEUTRINO_ICON_BUTTON_STOP , LOCALE_AUDIOPLAYER_STOP },
{ NEUTRINO_ICON_BUTTON_BACKWARD, LOCALE_AUDIOPLAYER_REWIND },
{ NEUTRINO_ICON_BUTTON_PAUSE , LOCALE_AUDIOPLAYER_PAUSE },
{ NEUTRINO_ICON_BUTTON_FORWARD , LOCALE_AUDIOPLAYER_FASTFORWARD },
},
{
{ NEUTRINO_ICON_BUTTON_RED , LOCALE_AUDIOPLAYER_DELETE },
@@ -1694,8 +1687,8 @@ const struct button_label AudioPlayerButtons[][4] =
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_AUDIOPLAYER_BUTTON_SELECT_TITLE_BY_NAME },
},
{
{ NEUTRINO_ICON_BUTTON_RED , LOCALE_AUDIOPLAYER_STOP },
{ NEUTRINO_ICON_BUTTON_YELLOW, LOCALE_AUDIOPLAYER_PAUSE },
{ NEUTRINO_ICON_BUTTON_STOP , LOCALE_AUDIOPLAYER_STOP },
{ NEUTRINO_ICON_BUTTON_PAUSE , LOCALE_AUDIOPLAYER_PAUSE },
},
{
{ NEUTRINO_ICON_BUTTON_GREEN , LOCALE_AUDIOPLAYER_ADD },