diff options
-rw-r--r-- | HISTORY.h | 9 | ||||
-rw-r--r-- | status.c | 22 | ||||
-rw-r--r-- | update.c | 6 | ||||
-rw-r--r-- | update.h | 3 |
4 files changed, 25 insertions, 15 deletions
@@ -5,8 +5,8 @@ * */ -#define _VERSION "1.1.117" -#define VERSION_DATE "18.08.2020" +#define _VERSION "1.1.118" +#define VERSION_DATE "22.0.2020" #define DB_API 7 @@ -19,8 +19,11 @@ /* * ------------------------------------ +2020-09-22: version 1.1.118 (horchi) + - bugfix: Fixed problem with update of timer table + 2020-08-18: version 1.1.117 (horchi) - - addeed: compatibility to VDRs peering feature + - added: compatibility to VDRs peering feature 2020-08-17: version 1.1.116 (horchi, patch by kfb77) - change: Improved match of series @@ -96,20 +96,20 @@ int RecLengthInSecs(const cRecording* pRecording) //*************************************************************************** // Notifications from VDRs Status Interface //*************************************************************************** -//*************************************************************************** -// Timers Change Notification -//*************************************************************************** +// //*************************************************************************** +// // Timers Change Notification +// //*************************************************************************** -void cUpdate::TimerChange(const cTimer* Timer, eTimerChange Change) -{ - if (!Epg2VdrConfig.shareInWeb) - return; +// void cUpdate::TimerChange(const cTimer* Timer, eTimerChange Change) +// { +// if (!Epg2VdrConfig.shareInWeb) +// return; - tell(1, "Timer changed, trigger update. Action was (%d)", Change); +// tell(1, "Timer changed, trigger update. Action was (%d)", Change); - timerTableUpdateTriggered = yes; - waitCondition.Broadcast(); // wakeup -} +// timerTableUpdateTriggered = yes; +// waitCondition.Broadcast(); // wakeup +// } //*************************************************************************** // Recording Notification (cStatus::MsgRecording(....)) @@ -1383,6 +1383,12 @@ void cUpdate::Action() { // update timer - even when epgd is busy! + if (cTimers::GetTimersRead(timerStateKey)) + { + timerTableUpdateTriggered = yes; + timerStateKey.Remove(); + } + if (dbConnected() && timerTableUpdateTriggered) updateTimerTable(); @@ -154,7 +154,7 @@ class cUpdate : public cThread, public cStatus, public cParameters // notifications from VDRs status interface - virtual void TimerChange(const cTimer* Timer, eTimerChange Change); + // virtual void TimerChange(const cTimer* Timer, eTimerChange Change); virtual void Recording(const cDevice *Device, const char *Name, const char *FileName, bool On); virtual void ChannelSwitch(const cDevice *Device, int ChannelNumber, bool LiveView); @@ -250,6 +250,7 @@ class cUpdate : public cThread, public cStatus, public cParameters int dbReconnectTriggered; int timerJobsUpdateTriggered; int timerTableUpdateTriggered; + cStateKey timerStateKey; int manualTrigger; int recordingStateChangedTrigger; int recordingFullReloadTrigger; |