diff options
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | HISTORY.DE | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | recstatus.c | 25 |
4 files changed, 20 insertions, 12 deletions
@@ -17,6 +17,8 @@ new: => http://www.vdr-portal.de/board17-developer/board21-vdr-plugins/p1289764-epgsearch-f%C3%BCr-vdr-2-3-x/#post1289764 - Commit menu_category_recsdone.diff by tomas & louis @vdr-portal.de http://www.vdr-portal.de/board1-news/board2-vdr-news/p1271995-skindesigner-1-0-0-neuer-default-skin-estuary4vdr/#post1271995 +- Commit 0001-revert-seperate-status-thread.diff by TomJoad@vdr-portal.de + http://www.vdr-portal.de/board17-developer/board21-vdr-plugins/p1291452-epgsearch-f%C3%BCr-vdr-2-3-x/#post1291452 2013-03-xx; Version 1.0.1 - maintenance release new: @@ -17,7 +17,8 @@ neu: => http://www.vdr-portal.de/board17-developer/board21-vdr-plugins/p1289764-epgsearch-f%C3%BCr-vdr-2-3-x/#post1289764 - Anwenden menu_category_recsdone.diff von tomas & louis @vdr-portal.de http://www.vdr-portal.de/board1-news/board2-vdr-news/p1271995-skindesigner-1-0-0-neuer-default-skin-estuary4vdr/#post1271995 - +- Anwenden 0001-revert-seperate-status-thread.diff von TomJoad@vdr-portal.de + http://www.vdr-portal.de/board17-developer/board21-vdr-plugins/p1291452-epgsearch-f%C3%BCr-vdr-2-3-x/#post1291452 2013-03-xx: Version 1.0.1 - Maintenance Release neu: @@ -132,7 +132,7 @@ ifeq ($(WITHOUT_QUICKSEARCH), 0) ALL += libvdr-$(PLUGIN4).so endif -OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o epgsearchsvdrp.o epgsearchtools.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o pending_notifications.o rcfile.o recdone.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o status_thread.o +OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o epgsearchsvdrp.o epgsearchtools.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o pending_notifications.o rcfile.o recdone.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o ifeq ($(REGEXLIB), pcre) LIBS += $(shell pcre-config --libs-posix) diff --git a/recstatus.c b/recstatus.c index f2fd993..f60dbd6 100644 --- a/recstatus.c +++ b/recstatus.c @@ -27,14 +27,10 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include "conflictcheck_thread.h" #include "epgsearchcfg.h" #include <math.h> -#if VDRVERSNUM > 20300 -#include "status_thread.h" -#else #define ALLOWED_BREAK_INSECS 2 extern int updateForced; extern int gl_InfoConflict; -#endif cRecStatusMonitor* gl_recStatusMonitor = NULL; @@ -45,9 +41,6 @@ cRecStatusMonitor::cRecStatusMonitor() void cRecStatusMonitor::Recording(const cDevice *Device, const char *Name, const char* Filename, bool On) { -#if VDRVERSNUM > 20300 - cStatusThread::Init(Device,Name,Filename,On); -#else time_t now = time(NULL); // insert new timers currently recording in TimersRecording if (On && Name) @@ -55,7 +48,13 @@ void cRecStatusMonitor::Recording(const cDevice *Device, const char *Name, const if (EPGSearchConfig.checkTimerConflOnRecording) cConflictCheckThread::Init((cPluginEpgsearch*)cPluginManager::GetPlugin("epgsearch"), true); - for (cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti)) +#if VDRVERSNUM > 20300 + LOCK_TIMERS_READ; + const cTimers *vdrtimers = Timers; +#else + cTimers *vdrtimers = &Timers; +#endif + for (const cTimer *ti = vdrtimers->First(); ti; ti = vdrtimers->Next(ti)) if (ti->Recording()) { // check if this is a new entry @@ -119,7 +118,14 @@ void cRecStatusMonitor::Recording(const cDevice *Device, const char *Name, const { // check if timer still exists bool found = false; - for (cTimer *ti = Timers.First(); ti; ti = Timers.Next(ti)) + +#if VDRVERSNUM > 20300 + LOCK_TIMERS_READ; + const cTimers *vdrtimers = Timers; +#else + cTimers *vdrtimers = &Timers; +#endif + for (const cTimer *ti = vdrtimers->First(); ti; ti = vdrtimers->Next(ti)) if (ti == tiR->timer) { found = true; @@ -203,7 +209,6 @@ void cRecStatusMonitor::Recording(const cDevice *Device, const char *Name, const tiR = TimersRecording.Next(tiR); } } -#endif } int cRecStatusMonitor::TimerRecDevice(const cTimer* timer) |