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/dvbsi++' commit 5db16ee2ff

Browse Source 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
This commit is contained in:
Stefan Seyfried
2013-02-21 17:07:18 +01:00
parent c83a35ebfc 5db16ee2ff
commit 0cf191822a
42 changed files with 871 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/gui/audioplayer.cpp
View File

@@ -275,7 +275,7 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
m_current = 0;
m_selected = 0;
m_width=(g_settings.screen_EndX - g_settings.screen_StartX) - ConnectLineBox_Width - 5;
m_width=(g_settings.screen_EndX - g_settings.screen_StartX) - 2*ConnectLineBox_Width - 5;
m_height = (g_settings.screen_EndY - g_settings.screen_StartY - 5);
m_sheight = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getHeight();
@@ -293,7 +293,9 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &actionKey)
m_listmaxshow = (m_height - m_info_height - m_title_height - m_theight - 2*m_buttonHeight) / (m_fheight);
m_height = m_theight + m_info_height + m_title_height + 2*m_buttonHeight + m_listmaxshow * m_fheight; // recalc height
m_x = getScreenStartX( m_width + ConnectLineBox_Width ) + ConnectLineBox_Width;
m_x = getScreenStartX( m_width );
if (m_x < ConnectLineBox_Width)
m_x = ConnectLineBox_Width;
m_y = getScreenStartY( m_height );
m_idletime=time(NULL);
@@ -360,6 +362,9 @@ int CAudioPlayerGui::show()
int ret = menu_return::RETURN_REPAINT;
// clear whole screen
m_frameBuffer->paintBackground();
CVFD::getInstance()->setMode(CVFD::MODE_AUDIO);
paintLCD();
@@ -420,8 +425,6 @@ int CAudioPlayerGui::show()
videoDecoder->ShowPicture(fname);
} else if (pic_index) {
pic_index = 0;
videoDecoder->StopPicture();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/mp3.jpg");
}
} else
pic_index = 0;
@@ -434,6 +437,11 @@ int CAudioPlayerGui::show()
if (m_screensaver)
{
screensaver(false);
if (msg < CRCInput::RC_MaxRC) {
// ignore first keypress - just quit the screensaver
g_RCInput->clearRCMsg();
continue;
}
}
}
@@ -895,9 +903,6 @@ int CAudioPlayerGui::show()
ret = menu_return::RETURN_EXIT_ALL;
loop = false;
}
// update mute icon
//paintHead();
//paintLCD();
}
m_frameBuffer->blit();
}
@@ -1592,6 +1597,7 @@ void CAudioPlayerGui::paintItem(int pos)
c_rad_small = 0;
}
m_frameBuffer->paintBoxRel(m_x, ypos, m_width - 15, m_fheight, COL_MENUCONTENT_PLUS_0);
m_frameBuffer->paintBoxRel(m_x, ypos, m_width - 15, m_fheight, bgcolor, c_rad_small);
if ((pos + m_liststart) < m_playlist.size())
@@ -1666,20 +1672,6 @@ void CAudioPlayerGui::paintHead()
xpos -= (iw + 10);
}
//m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MENU, m_x + m_width - 30, ypos);
#endif
#if 1
if ( CNeutrinoApp::getInstance()->isMuted() )
{
#if 0
int xpos = m_x + m_width - 75;
ypos = m_y + m_title_height;
if (m_theight > 32)
ypos = (m_theight - 32) / 2 + m_y + m_title_height;
m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MUTE, xpos, ypos);
#endif
m_frameBuffer->getIconSize(NEUTRINO_ICON_BUTTON_MUTE, &iw, &ih);
m_frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_MUTE, xpos - iw, ypos, m_theight);
}
#endif
m_frameBuffer->blit();
}
@@ -1734,7 +1726,9 @@ const struct button_label AudioPlayerButtons[][4] =
void CAudioPlayerGui::paintFoot()
{
// printf("paintFoot{\n");
if (m_screensaver)
return;
const struct button_label ScondLineButtons[3] =
{
{ NEUTRINO_ICON_BUTTON_OKAY , LOCALE_AUDIOPLAYER_PLAY },
@@ -1750,8 +1744,8 @@ const struct button_label ScondLineButtons[3] =
top = m_y + (m_height - 2 * m_buttonHeight);
//int ButtonWidth2 = (m_width - 50) / 2;
m_frameBuffer->paintBoxRel(m_x, top, m_width, 2 * m_buttonHeight, COL_INFOBAR_SHADOW_PLUS_1, c_rad_mid, CORNER_BOTTOM);
m_frameBuffer->paintHLine(m_x, m_x + m_width, top, COL_INFOBAR_SHADOW_PLUS_1);
m_frameBuffer->paintBoxRel(m_x, top, m_width, 2 * m_buttonHeight, COL_INFOBAR_SHADOW_PLUS_1, c_rad_mid, (m_show_playlist ? CORNER_BOTTOM : CORNER_ALL));
// why? m_frameBuffer->paintHLine(m_x, m_x + m_width, top, COL_INFOBAR_SHADOW_PLUS_1);
if (!m_playlist.empty())
::paintButtons(m_x, top+m_buttonHeight, m_width, 3, ScondLineButtons, m_width, m_buttonHeight);
@@ -1799,6 +1793,9 @@ const struct button_label ScondLineButtons[3] =
//------------------------------------------------------------------------
void CAudioPlayerGui::paintInfo()
{
if (m_screensaver)
return;
int c_rad_mid = RADIUS_MID;
if (m_state == CAudioPlayerGui::STOP && m_show_playlist)
m_frameBuffer->paintBackgroundBoxRel(m_x, m_y, m_width, m_title_height);
@@ -1896,8 +1893,8 @@ void CAudioPlayerGui::paint()
m_frameBuffer->paintBoxRel(m_x + m_width - 13, ypos + 2 + sbs*(sb-4)/sbc , 11, (sb-4)/sbc, COL_MENUCONTENT_PLUS_3, RADIUS_SMALL);
}
paintFoot();
paintInfo();
paintFoot();
m_frameBuffer->blit();
m_visible = true;
@@ -2115,11 +2112,9 @@ void CAudioPlayerGui::play(unsigned int pos)
//LCD
paintLCD();
// Display
if (!m_screensaver)
paintInfo();
paintInfo();
m_key_level = 1;
if (!m_screensaver)
paintFoot();
paintFoot();
}
}
//------------------------------------------------------------------------
@@ -2338,11 +2333,8 @@ void CAudioPlayerGui::screensaver(bool on)
{
g_RCInput->killTimer(stimer);
m_screensaver = false;
#if 0
m_frameBuffer->loadPal("radiomode.pal", 18, COL_MAXFREE);
m_frameBuffer->useBackground(m_frameBuffer->loadBackground(NEUTRINO_ICON_RADIOMODE));// set useBackground true or false
m_frameBuffer->paintBackground();
#endif
videoDecoder->StopPicture();
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/mp3.jpg");
paint();
m_idletime = time(NULL);
}