mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 08:21:12 +02:00
Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...needs buildfixing... Conflicts: data/icons/shutdown.jpg data/icons/start.jpg lib/libtuxtxt/tuxtxt.h src/driver/Makefile.am src/driver/audiodec/Makefile.am src/driver/framebuffer.cpp src/driver/record.cpp src/driver/volume.cpp src/gui/audio_setup.cpp src/gui/audioplayer.cpp src/gui/epgview.cpp src/gui/eventlist.cpp src/gui/filebrowser.cpp src/gui/infoviewer.cpp src/gui/keybind_setup.cpp src/gui/miscsettings_menu.cpp src/gui/movieplayer.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/videosettings.cpp src/gui/widget/menue.cpp src/neutrino.cpp src/neutrino_menue.cpp src/system/Makefile.am src/system/configure_network.cpp src/system/httptool.cpp src/system/setting_helpers.cpp src/timerd/timermanager.cpp src/zapit/include/zapit/frontend_c.h src/zapit/src/Makefile.am src/zapit/src/capmt.cpp src/zapit/src/frontend.cpp src/zapit/src/zapit.cpp
This commit is contained in:
@@ -68,6 +68,7 @@ CVFD::CVFD()
|
||||
text[0] = 0;
|
||||
clearClock = 0;
|
||||
mode = MODE_TVRADIO;
|
||||
switch_name_time_cnt = 0;
|
||||
}
|
||||
|
||||
CVFD::~CVFD()
|
||||
@@ -88,7 +89,7 @@ CVFD* CVFD::getInstance()
|
||||
void CVFD::count_down() {
|
||||
if (timeout_cnt > 0) {
|
||||
timeout_cnt--;
|
||||
if (timeout_cnt == 0) {
|
||||
if (timeout_cnt == 0 ) {
|
||||
if (g_settings.lcd_setting_dim_brightness > -1) {
|
||||
// save lcd brightness, setBrightness() changes global setting
|
||||
int b = g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS];
|
||||
@@ -99,6 +100,14 @@ void CVFD::count_down() {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (g_settings.lcd_info_line && switch_name_time_cnt > 0) {
|
||||
switch_name_time_cnt--;
|
||||
if (switch_name_time_cnt == 0) {
|
||||
if (g_settings.lcd_setting_dim_brightness > -1) {
|
||||
CVFD::getInstance()->showTime(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void CVFD::wake_up() {
|
||||
@@ -110,6 +119,9 @@ void CVFD::wake_up() {
|
||||
}
|
||||
else
|
||||
setPower(1);
|
||||
if(g_settings.lcd_info_line){
|
||||
switch_name_time_cnt = g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + 10;
|
||||
}
|
||||
}
|
||||
|
||||
void* CVFD::TimeThread(void *)
|
||||
@@ -288,7 +300,7 @@ void CVFD::showTime(bool force)
|
||||
|
||||
ftime(&tm);
|
||||
t = localtime(&tm.time);
|
||||
if(force || ((hour != t->tm_hour) || (minute != t->tm_min))) {
|
||||
if(force || ( switch_name_time_cnt == 0 && ((hour != t->tm_hour) || (minute != t->tm_min))) ) {
|
||||
hour = t->tm_hour;
|
||||
minute = t->tm_min;
|
||||
strftime(timestr, 20, "%H:%M", t);
|
||||
@@ -495,7 +507,7 @@ void CVFD::setMode(const MODES m, const char * const title)
|
||||
showServicename(servicename);
|
||||
showclock = true;
|
||||
if(g_settings.lcd_info_line)
|
||||
showTime(); /* "showclock = true;" implies that "showTime();" does a "displayUpdate();" */
|
||||
switch_name_time_cnt = g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + 10;
|
||||
break;
|
||||
case MODE_AUDIO:
|
||||
{
|
||||
|
Reference in New Issue
Block a user