summaryrefslogtreecommitdiff
path: root/epgsearchext.c
diff options
context:
space:
mode:
authorFrank Neumann <fnu@yavdr.org>2017-05-07 10:39:01 +0200
committerFrank Neumann <fnu@yavdr.org>2017-05-07 10:39:01 +0200
commit26a17d704a9396897d17aa12d877ef23eaa5dd50 (patch)
treecb73880b7a2bf489c5007185579ae5f740300279 /epgsearchext.c
parentcf9d8e7257ef26b80d3998d4cdb12cd1e39d5e5c (diff)
downloadvdr-plugin-epgsearch-26a17d704a9396897d17aa12d877ef23eaa5dd50.tar.gz
vdr-plugin-epgsearch-26a17d704a9396897d17aa12d877ef23eaa5dd50.tar.bz2
Commit 0003-revert-now-obsolete-pointer-params.diff (thx TomJoad@vdr-portal.de)
Diffstat (limited to 'epgsearchext.c')
-rw-r--r--epgsearchext.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/epgsearchext.c b/epgsearchext.c
index 28ea0b5..5d45f8a 100644
--- a/epgsearchext.c
+++ b/epgsearchext.c
@@ -1304,8 +1304,7 @@ void cSearchExt::CheckExistingRecordings(cSearchResults* pResults)
LogFile.Log(3,"analysing existing recordings for search timer '%s'...", search);
// how many recordings do we already have?
- cRecordings *vdrrecordings = NULL;
- int num = GetCountRecordings(vdrrecordings);
+ int num = GetCountRecordings();
cSearchResult* pResultObj = NULL;
int remain = pauseOnNrRecordings - num;
@@ -1433,17 +1432,15 @@ cTimerObjList* cSearchExt::GetTimerList(const cTimers* vdrtimers, cTimerObjList*
}
// counts the currently existent recordings triggered by this search timer
-int cSearchExt::GetCountRecordings(cRecordings *vdrrecordings)
+int cSearchExt::GetCountRecordings()
{
int countRecs = 0;
#if VDRVERSNUM > 20300
- if (!vdrrecordings) {
- LOCK_RECORDINGS_READ;
- vdrrecordings = (cRecordings *)Recordings;
- }
+ LOCK_RECORDINGS_READ;
+ const cRecordings *vdrrecordings = Recordings;
#else
- vdrrecordings = &Recordings;
+ cRecordings *vdrrecordings = &Recordings;
#endif
for (const cRecording *recording = vdrrecordings->First(); recording; recording = vdrrecordings->Next(recording))
{