mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

- TRIPLEDRAGON: deleted

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	src/system/flashtool.cpp
This commit is contained in:
max_10
2020-10-03 22:47:34 +02:00
committed by Thilo Graf
parent fa91372706
commit 1fa824cab3
26 changed files with 22 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/gui/infoviewer.cpp
View File

@@ -2203,49 +2203,6 @@ int CInfoViewer::showChannelLogo(const t_channel_id logo_channel_id, const int c
return res;
}
#if HAVE_TRIPLEDRAGON
/* the cheap COOLSTREAM display cannot do this, so keep the routines separate */
void CInfoViewer::showLcdPercentOver()
{
if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] != 1)
{
if (fileplay || NeutrinoModes::mode_ts == CNeutrinoApp::getInstance()->getMode()) {
CVFD::getInstance()->showPercentOver(CMoviePlayerGui::getInstance().file_prozent);
return;
}
static long long old_interval = 0;
int runningPercent = -1;
time_t jetzt = time(NULL);
long long interval = 60000000; /* 60 seconds default update time */
if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_current) {
if (jetzt < info_CurrentNext.current_zeit.startzeit)
runningPercent = 0;
else if (jetzt > (int)(info_CurrentNext.current_zeit.startzeit +
info_CurrentNext.current_zeit.dauer))
runningPercent = -2; /* overtime */
else {
runningPercent = MIN((jetzt-info_CurrentNext.current_zeit.startzeit) * 100 /
info_CurrentNext.current_zeit.dauer, 100);
interval = info_CurrentNext.current_zeit.dauer * 1000LL * (1000/100); // update every percent
if (is_visible && interval > 60000000) // if infobar visible, update at
interval = 60000000; // least once per minute (radio mode)
if (interval < 5000000)
interval = 5000000; // but update only every 5 seconds
}
}
if (interval != old_interval) {
g_RCInput->killTimer(lcdUpdateTimer);
lcdUpdateTimer = g_RCInput->addTimer(interval, false);
//printf("lcdUpdateTimer: interval %lld old %lld\n",interval/1000000,old_interval/1000000);
old_interval = interval;
}
CLCD::getInstance()->showPercentOver(runningPercent);
int mode = CNeutrinoApp::getInstance()->getMode();
if ((mode == NeutrinoModes::mode_radio || mode == NeutrinoModes::mode_tv))
CVFD::getInstance()->setEPGTitle(info_CurrentNext.current_name);
}
}
#else
void CInfoViewer::showLcdPercentOver ()
{
if (g_settings.lcd_setting[SNeutrinoSettings::LCD_SHOW_VOLUME] != 1) {
@@ -2264,7 +2221,6 @@ void CInfoViewer::showLcdPercentOver ()
CVFD::getInstance ()->showPercentOver (runningPercent);
}
}
#endif
void CInfoViewer::showEpgInfo() //message on event change
{