diff options
| author | Christian Wieninger <cwieninger@gmx.de> | 2011-09-04 20:49:11 +0200 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2011-09-04 20:49:11 +0200 |
| commit | 945baaafee98d8daeb20647c795c8176479fd5df (patch) | |
| tree | 92193080075e9d975f812e6e3f41f11eb55c27de | |
| parent | c862161382fef270b59db640c3d2e2ae5721705a (diff) | |
| download | vdr-plugin-epgsearch-945baaafee98d8daeb20647c795c8176479fd5df.tar.gz vdr-plugin-epgsearch-945baaafee98d8daeb20647c795c8176479fd5df.tar.bz2 | |
API changes for __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS in vdr-1.7.21
| -rw-r--r-- | mail.c | 2 | ||||
| -rw-r--r-- | menu_searchresults.c | 4 | ||||
| -rw-r--r-- | searchtimer_thread.c | 18 |
3 files changed, 23 insertions, 1 deletions
@@ -74,7 +74,7 @@ const cEvent* cMailTimerNotification::GetEvent() const const cSchedules *schedules = cSchedules::Schedules(schedulesLock); if (!schedules) return NULL; const cSchedule *schedule = schedules->GetSchedule(channelID); - if (!schedule) return NULL; + if (!schedule) return NULL; return schedule->GetEvent(eventID); } diff --git a/menu_searchresults.c b/menu_searchresults.c index b26e6cd..0f5fb4f 100644 --- a/menu_searchresults.c +++ b/menu_searchresults.c @@ -47,7 +47,11 @@ extern bool isUTF8; static int CompareRecording(const void *p1, const void *p2) { +#if APIVERSNUM < 10721 return (int)((*(cRecording **)p1)->start - (*(cRecording **)p2)->start); +#else + return (int)((*(cRecording **)p1)->Start() - (*(cRecording **)p2)->Start()); +#endif } // --- cMenuSearchResultsItem ------------------------------------------------------- diff --git a/searchtimer_thread.c b/searchtimer_thread.c index b82df28..833b2cd 100644 --- a/searchtimer_thread.c +++ b/searchtimer_thread.c @@ -777,8 +777,13 @@ void cSearchTimerThread::CheckExpiredRecs() cList<cRecordingObj> DelRecordings; for (cRecording *recording = Recordings.First(); recording && m_Active; recording = Recordings.Next(recording)) { +#if APIVERSNUM < 10721 LogFile.Log(3, "check recording %s from %s for expiration", recording->Name(), DAYDATETIME(recording->start)); if (recording->start == 0) +#else + LogFile.Log(3, "check recording %s from %s for expiration", recording->Name(), DAYDATETIME(recording->Start())); + if (recording->Start() == 0) +#endif { LogFile.Log(2, "oops, recording %s has no start time, skipped", recording->Name()); continue; @@ -809,7 +814,12 @@ void cSearchTimerThread::CheckExpiredRecs() LogFile.Log(3, "recording triggered from search timer %s", search->search); if (search->delAfterDays == 0) continue; time_t now = time(NULL); + +#if APIVERSNUM < 10721 int daysBetween = int(double((now - recording->start)) / (60*60*24)); +#else + int daysBetween = int(double((now - recording->Start())) / (60*60*24)); +#endif if (daysBetween >= search->delAfterDays) DelRecordings.Add(new cRecordingObj(recording, search)); else @@ -821,10 +831,18 @@ void cSearchTimerThread::CheckExpiredRecs() cSearchExt* search = recordingObj->search; if (search->recordingsKeep > 0 && search->recordingsKeep >= search->GetCountRecordings()) { +#if APIVERSNUM < 10721 LogFile.Log(1, "recording '%s' from %s expired, but will be kept, search timer %s", recording->Name(), DAYDATETIME(recording->start), recordingObj->search->search); +#else + LogFile.Log(1, "recording '%s' from %s expired, but will be kept, search timer %s", recording->Name(), DAYDATETIME(recording->Start()), recordingObj->search->search); +#endif continue; } +#if APIVERSNUM < 10721 LogFile.Log(1, "delete expired recording '%s' from %s, search timer %s", recording->Name(), DAYDATETIME(recording->start), recordingObj->search->search); +#else + LogFile.Log(1, "delete expired recording '%s' from %s, search timer %s", recording->Name(), DAYDATETIME(recording->Start()), recordingObj->search->search); +#endif cRecordControl *rc = cRecordControls::GetRecordControl(recording->FileName()); if (!rc) { |