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

Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'

Browse Source 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-11-03 10:43:14 +01:00
parent 9ca9f9c6f8 9d1444a8df
commit 58ca3266e7
123 changed files with 1901 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/system/setting_helpers.cpp
View File

@@ -129,10 +129,9 @@ bool CTouchFileNotifier::changeNotify(const neutrino_locale_t, void * data)
return true;
}
bool CColorSetupNotifier::changeNotify(const neutrino_locale_t, void *)
void CColorSetupNotifier::setPalette()
{
CFrameBuffer *frameBuffer = CFrameBuffer::getInstance();
// unsigned char r,g,b;
//setting colors-..
frameBuffer->paletteGenFade(COL_MENUHEAD,
convertSetupColor2RGB(g_settings.menu_Head_red, g_settings.menu_Head_green, g_settings.menu_Head_blue),
@@ -165,13 +164,6 @@ bool CColorSetupNotifier::changeNotify(const neutrino_locale_t, void *)
convertSetupColor2RGB(g_settings.infobar_Text_red, g_settings.infobar_Text_green, g_settings.infobar_Text_blue),
8, convertSetupAlpha2Alpha(g_settings.infobar_alpha) );
/* frameBuffer->paletteSetColor( COL_INFOBAR_SHADOW,
convertSetupColor2RGB(
int(g_settings.infobar_red*0.4),
int(g_settings.infobar_green*0.4),
int(g_settings.infobar_blue*0.4)),
g_settings.infobar_alpha);
*/
frameBuffer->paletteGenFade(COL_INFOBAR_SHADOW,
convertSetupColor2RGB(int(g_settings.infobar_red*0.4), int(g_settings.infobar_green*0.4), int(g_settings.infobar_blue*0.4)),
convertSetupColor2RGB(g_settings.infobar_Text_red, g_settings.infobar_Text_green, g_settings.infobar_Text_blue),
@@ -189,10 +181,17 @@ bool CColorSetupNotifier::changeNotify(const neutrino_locale_t, void *)
8, convertSetupAlpha2Alpha(g_settings.infobar_alpha) );
frameBuffer->paletteSet();
}
bool CColorSetupNotifier::changeNotify(const neutrino_locale_t, void *)
{
setPalette();
#if 0
/* recalculate volumebar */
CVolume::getInstance()->Init();
/* recalculate infoclock */
CInfoClock::getInstance()->Init();
#endif
return false;
}
@@ -488,8 +487,7 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
//CNeutrinoApp::getInstance()->loadColors(NEUTRINO_SETTINGS_FILE);
CNeutrinoApp::getInstance()->SetupFonts();
CNeutrinoApp::getInstance()->SetupTiming();
CColorSetupNotifier colorSetupNotifier;
colorSetupNotifier.changeNotify(NONEXISTANT_LOCALE, NULL);
CColorSetupNotifier::setPalette();
CVFD::getInstance()->setlcdparameter();
CFrameBuffer::getInstance()->Clear();
}
@@ -501,24 +499,26 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
}
#if HAVE_COOL_HARDWARE
bool CFanControlNotifier::changeNotify(const neutrino_locale_t, void * data)
void CFanControlNotifier::setSpeed(unsigned int speed)
{
int cfd, ret;
//unsigned char speed = (unsigned char) g_settings.fan_speed;
unsigned int speed = * (int *) data;
int cfd;
printf("FAN Speed %d\n", speed);
cfd = open("/dev/cs_control", O_RDONLY);
if(cfd < 0) {
perror("Cannot open /dev/cs_control");
return false;
return;
}
ret = ioctl(cfd, IOC_CONTROL_PWM_SPEED, speed);
close(cfd);
if(ret < 0) {
if (ioctl(cfd, IOC_CONTROL_PWM_SPEED, speed) < 0)
perror("IOC_CONTROL_PWM_SPEED");
return false;
}
close(cfd);
}
bool CFanControlNotifier::changeNotify(const neutrino_locale_t, void * data)
{
unsigned int speed = * (int *) data;
setSpeed(speed);
return false;
}
#else