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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-21 12:46:49 +01:00
parent ccd9e67d78 f57041a98b
commit 6b0e887585
125 changed files with 3517 additions and 3169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/timerd/timermanager.cpp
View File

@@ -1224,7 +1224,7 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId):
//------------------------------------------------------------
void CTimerEvent_Record::fireEvent()
{
if (adjustToCurrentEPG())
if ((adjustToCurrentEPG()) && (alarmTime > time(NULL)))
return;
getEpgId();
CTimerd::RecordingInfo ri=eventInfo;
@@ -1240,7 +1240,7 @@ void CTimerEvent_Record::fireEvent()
//------------------------------------------------------------
void CTimerEvent_Record::announceEvent()
{
if (adjustToCurrentEPG())
if ((adjustToCurrentEPG()) && (announceTime > time(NULL)))
return;
Refresh();
CTimerd::RecordingInfo ri=eventInfo;
@@ -1254,8 +1254,6 @@ void CTimerEvent_Record::announceEvent()
//------------------------------------------------------------
void CTimerEvent_Record::stopEvent()
{
if (adjustToCurrentEPG())
return;
CTimerd::RecordingStopInfo stopinfo;
// Set EPG-ID if not set
stopinfo.eventID = eventID;
@@ -1346,6 +1344,9 @@ void CTimerEvent_Record::Refresh()
//------------------------------------------------------------
bool CTimerEvent_Record::adjustToCurrentEPG()
{
if (!(access(CONFIGDIR"/.adjust", F_OK) == 0))
return false;
if (!autoAdjustToEPG)
return false;
@@ -1382,9 +1383,11 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
_stopTime += post;
}
if ((_alarmTime != alarmTime) || (_announceTime != announceTime) || (_stopTime != stopTime))
if ((_alarmTime != alarmTime) || (_announceTime != announceTime) || (_stopTime != stopTime)) {
alarmTime = _alarmTime; announceTime = _announceTime; stopTime = _stopTime;
if (CTimerManager::getInstance()->adjustEvent(eventID, _announceTime, _alarmTime, _stopTime))
return true;
}
return false;
}