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

Merge branch 'cst-next' into nmp-cst-next

Browse Source 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
This commit is contained in:
Michael Liebmann
2016-08-19 17:40:48 +02:00
parent 35446879cf 6a997dfeba
commit 4246a31ba6
260 changed files with 8682 additions and 4001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/system/setting_helpers.cpp
View File

@@ -172,12 +172,17 @@ void CColorSetupNotifier::setPalette()
convertSetupColor2RGB(t.menu_Content_inactive_Text_red, t.menu_Content_inactive_Text_green, t.menu_Content_inactive_Text_blue),
8, convertSetupAlpha2Alpha(t.menu_Content_inactive_alpha) );
frameBuffer->paletteGenFade(COL_MENUFOOT,
convertSetupColor2RGB(t.menu_Foot_red, t.menu_Foot_green, t.menu_Foot_blue),
convertSetupColor2RGB(t.menu_Foot_Text_red, t.menu_Foot_Text_green, t.menu_Foot_Text_blue),
8, convertSetupAlpha2Alpha( t.menu_Foot_alpha ) );
frameBuffer->paletteGenFade(COL_INFOBAR,
convertSetupColor2RGB(t.infobar_red, t.infobar_green, t.infobar_blue),
convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue),
8, convertSetupAlpha2Alpha(t.infobar_alpha) );
frameBuffer->paletteGenFade(COL_INFOBAR_SHADOW,
frameBuffer->paletteGenFade(COL_SHADOW,
convertSetupColor2RGB(int(t.infobar_red*0.4), int(t.infobar_green*0.4), int(t.infobar_blue*0.4)),
convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue),
8, convertSetupAlpha2Alpha(t.infobar_alpha) );
@@ -208,10 +213,10 @@ void CColorSetupNotifier::setPalette()
convertSetupColor2RGB(t.infobar_Text_red, t.infobar_Text_green, t.infobar_Text_blue),
convertSetupAlpha2Alpha(t.infobar_alpha));
// COL_INFOBAR_SHADOW_TEXT
// COL_MENUFOOT_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 2,
convertSetupColor2RGB(int(t.infobar_Text_red*0.6), int(t.infobar_Text_green*0.6), int(t.infobar_Text_blue*0.6)),
convertSetupAlpha2Alpha(t.infobar_alpha));
convertSetupColor2RGB(t.menu_Foot_Text_red, t.menu_Foot_Text_green, t.menu_Foot_Text_blue),
convertSetupAlpha2Alpha(t.menu_Foot_alpha));
// COL_MENUHEAD_TEXT
frameBuffer->paletteSetColor(COL_NEUTRINO_TEXT + 3,
@@ -379,12 +384,20 @@ int CNVODChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)
int CMoviePluginChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)
{
int sel= atoi(actionKey.c_str());
parent->hide();
if (sel>=0)
if (parent)
parent->hide();
if (actionKey == "---")
{
g_settings.movieplayer_plugin=g_PluginList->getName(sel);
g_settings.movieplayer_plugin = actionKey;
}
else
{
int sel = atoi(actionKey.c_str());
if (sel >= 0)
g_settings.movieplayer_plugin = g_PluginList->getName(sel);
}
return menu_return::RETURN_EXIT;
}
@@ -397,7 +410,7 @@ long CNetAdapter::mac_addr_sys ( u_char *addr) //only for function getMacAddr()
int s, i;
int ok = 0;
s = socket(AF_INET, SOCK_DGRAM, 0);
if (s==-1)
if (s==-1)
{
return -1;
}
@@ -409,11 +422,11 @@ long CNetAdapter::mac_addr_sys ( u_char *addr) //only for function getMacAddr()
for (i = ifc.ifc_len / sizeof(struct ifreq); --i >= 0; IFR++)
{
strcpy(ifr.ifr_name, IFR->ifr_name);
if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0)
if (ioctl(s, SIOCGIFFLAGS, &ifr) == 0)
{
if (! (ifr.ifr_flags & IFF_LOOPBACK))
if (! (ifr.ifr_flags & IFF_LOOPBACK))
{
if (ioctl(s, SIOCGIFHWADDR, &ifr) == 0)
if (ioctl(s, SIOCGIFHWADDR, &ifr) == 0)
{
ok = 1;
break;