Merge remote-tracking branch 'check/next-cc'

needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
This commit is contained in:
Stefan Seyfried
2013-09-01 19:46:10 +02:00
163 changed files with 4066 additions and 1537 deletions

View File

@@ -199,6 +199,16 @@ void CVFD::setled(int led1, int led2){
}
}
void CVFD::setBacklight(bool on_off)
{
if(cs_get_revision() != 9)
return;
int led = on_off ? FP_LED_3_ON : FP_LED_3_OFF;
if (ioctl(fd, IOC_FP_LED_CTRL, led) < 0)
perror("FP_LED_3");
}
void CVFD::setled(bool on_off)
{
if(g_settings.led_rec_mode == 0)