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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/pictureviewer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 42d1c25a8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-19 (Wed, 19 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-19 10:22:43 +02:00
parent cfe223716c b2facb1e28
commit 83f403dfb7
17 changed files with 311 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/gui/upnpbrowser.cpp
View File

@@ -955,22 +955,25 @@ void CUpnpBrowserGui::paintDeviceInfo()
void CUpnpBrowserGui::paintDevice(unsigned int _pos)
{
int ypos = m_item_y + _pos*m_item_height;
unsigned int pos = m_deviceliststart + _pos;
bool i_selected = pos == m_selecteddevice;
int i_radius = RADIUS_NONE;
fb_pixel_t color;
fb_pixel_t bgcolor;
unsigned int pos = m_deviceliststart + _pos;
if (pos == m_selecteddevice)
getItemColors(color, bgcolor, i_selected);
if (i_selected)
{
color = COL_MENUCONTENTSELECTED_TEXT;
bgcolor = COL_MENUCONTENTSELECTED_PLUS_0;
paintDeviceInfo();
i_radius = RADIUS_LARGE;
}
else
{
color = COL_MENUCONTENT_TEXT;
bgcolor = COL_MENUCONTENT_PLUS_0;
}
m_frameBuffer->paintBoxRel(m_x, ypos, m_width - 15, m_item_height, bgcolor);
if (i_radius)
m_frameBuffer->paintBoxRel(m_x, ypos, m_width - 15, m_item_height, COL_MENUCONTENT_PLUS_0);
m_frameBuffer->paintBoxRel(m_x, ypos, m_width - 15, m_item_height, bgcolor, i_radius);
if (pos >= m_devices.size())
return;
@@ -1024,27 +1027,28 @@ void CUpnpBrowserGui::paintDevices()
void CUpnpBrowserGui::paintItem(std::vector<UPnPEntry> *entries, unsigned int pos, unsigned int selected)
{
int ypos = m_item_y + pos*m_item_height;
bool i_selected = pos == selected;
int i_radius = RADIUS_NONE;
fb_pixel_t color;
fb_pixel_t bgcolor;
if (pos == selected)
{
color = COL_MENUCONTENT_TEXT_PLUS_2;
bgcolor = COL_MENUCONTENT_PLUS_2;
}
else
{
color = COL_MENUCONTENT_TEXT;
bgcolor = COL_MENUCONTENT_PLUS_0;
}
m_frameBuffer->paintBoxRel(m_x, ypos, m_width - 15, m_item_height, bgcolor);
getItemColors(color, bgcolor, i_selected);
if (i_selected)
i_radius = RADIUS_LARGE;
if (i_radius)
m_frameBuffer->paintBoxRel(m_x, ypos, m_width - 15, m_item_height, COL_MENUCONTENT_PLUS_0);
m_frameBuffer->paintBoxRel(m_x, ypos, m_width - 15, m_item_height, bgcolor, i_radius);
if (pos >= (*entries).size())
return;
UPnPEntry *entry = &(*entries)[pos];
if (pos == selected)
if (i_selected)
{
paintItemInfo(entry);
paintDetails(entry);
@@ -1312,8 +1316,7 @@ void CUpnpBrowserGui::playVideo(std::string name, std::string url)
{
CNeutrinoApp::getInstance()->handleMsg(NeutrinoMessages::CHANGEMODE, NeutrinoMessages::mode_ts);
if (CAudioPlayer::getInstance()->getState() != CBaseDec::STOP)
CAudioPlayer::getInstance()->stop();
stopAudio();
m_frameBuffer->stopFrame();
CMoviePlayerGui::getInstance().SetFile(name, url);