diff -Naur epgsearch-0.9.24.org/epgsearchext.c epgsearch-0.9.24/epgsearchext.c --- epgsearch-0.9.24.org/epgsearchext.c 2008-04-13 14:53:44.000000000 -0400 +++ epgsearch-0.9.24/epgsearchext.c 2008-09-11 10:23:26.000000000 -0400 @@ -347,7 +347,7 @@ } } - msprintf(&buffer, "%d:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d:%d:%d:%s:%s:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%ld:%d:%d:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%d:%ld:%ld:%d:%d", + msprintf(&buffer, "%d:%s:%d:%s:%s:%d:%s:%d:%d:%d:%d:%d:%d:%s:%s:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%ld:%d:%d:%d:%d:%d:%d:%s:%d:%d:%d:%d:%d:%d:%ld:%ld:%d:%d", ID, tmp_search, useTime, @@ -370,6 +370,7 @@ tmp_directory, Priority, Lifetime, + Action, MarginStart, MarginStop, useVPS, diff -Naur epgsearch-0.9.24.org/epgsearchext.h epgsearch-0.9.24/epgsearchext.h --- epgsearch-0.9.24.org/epgsearchext.h 2008-04-13 14:53:42.000000000 -0400 +++ epgsearch-0.9.24/epgsearchext.h 2008-09-11 10:06:54.000000000 -0400 @@ -130,6 +130,7 @@ char directory[MaxFileName]; int Priority; int Lifetime; + int Action; int MarginStart; int MarginStop; int useVPS; diff -Naur epgsearch-0.9.24.org/epgsearchsvdrp.c epgsearch-0.9.24/epgsearchsvdrp.c --- epgsearch-0.9.24.org/epgsearchsvdrp.c 2008-04-13 14:53:44.000000000 -0400 +++ epgsearch-0.9.24/epgsearchsvdrp.c 2008-09-11 10:08:50.000000000 -0400 @@ -418,7 +418,7 @@ strftime(bufStart, sizeof(bufStart), "%H%M", localtime_r(&start, &tm_r)); strftime(bufEnd, sizeof(bufEnd), "%H%M", localtime_r(&stop, &tm_r)); - cString cmdbuf = cString::sprintf("NEWT %d:%d:%s:%s:%s:%d:%d:%s:%s", + cString cmdbuf = cString::sprintf("NEWT %d:%d:%s:%s:%s:%d:%d:%d:%s:%s", Flags, Timer->Channel()->Number(), #if VDRVERSNUM < 10503 @@ -430,6 +430,7 @@ bufEnd, search->Priority, search->Lifetime, + search->Action, Timer->File(), ""); diff -Naur epgsearch-0.9.24.org/Makefile epgsearch-0.9.24/Makefile --- epgsearch-0.9.24.org/Makefile 2008-04-13 14:53:42.000000000 -0400 +++ epgsearch-0.9.24/Makefile 2008-09-11 09:22:49.000000000 -0400 @@ -5,9 +5,9 @@ # ### uncomment one of these lines, if you don't want the addon epgsearchonly, conflictcheckonly -#WITHOUT_EPGSEARCHONLY=1 -#WITHOUT_CONFLICTCHECKONLY=1 -#WITHOUT_QUICKSEARCH=1 +WITHOUT_EPGSEARCHONLY=1 +WITHOUT_CONFLICTCHECKONLY=1 +WITHOUT_QUICKSEARCH=1 PLUGIN = epgsearch MAINMENUSHORTCUT = epgsearchmainmenushortcut diff -Naur epgsearch-0.9.24.org/searchtimer_thread.c epgsearch-0.9.24/searchtimer_thread.c --- epgsearch-0.9.24.org/searchtimer_thread.c 2008-04-28 12:22:31.000000000 -0400 +++ epgsearch-0.9.24/searchtimer_thread.c 2008-09-11 10:19:44.000000000 -0400 @@ -268,6 +268,7 @@ } int Priority = searchExt->Priority; int Lifetime = searchExt->Lifetime; + int Action = searchExt->Action; // search for an already existing timer bool bTimesMatchExactly = false; @@ -358,7 +359,8 @@ index = t->Index()+1; Priority = t->Priority(); Lifetime = t->Lifetime(); - } + Action = t->Action(); + } free(pFile); if (t->Recording() && t->StopTime() == timer->StopTime()) @@ -415,7 +417,7 @@ continue; } - if (AddModTimer(timer, index, searchExt, pEvent, Priority, Lifetime, Summary, timerMod)) + if (AddModTimer(timer, index, searchExt, pEvent, Priority, Lifetime, Action, Summary, timerMod)) { if (index == 0) LogFile.Log(1,"added timer for '%s~%s' (%s - %s); search timer: '%s'", pEvent->Title(), pEvent->ShortText()?pEvent->ShortText():"", GETDATESTRING(pEvent), GETTIMESTRING(pEvent), searchExt->search); @@ -581,7 +583,7 @@ return tmpSummary; } -bool cSearchTimerThread::AddModTimer(cTimer* Timer, int index, cSearchExt* searchExt, const cEvent* pEvent, int Prio, int Lifetime, char* Summary, uint timerMod) +bool cSearchTimerThread::AddModTimer(cTimer* Timer, int index, cSearchExt* searchExt, const cEvent* pEvent, int Prio, int Lifetime, int Act, char* Summary, uint timerMod) { char *cmdbuf = NULL; @@ -622,7 +624,7 @@ tmpSummary = SummaryExtended(searchExt, Timer, pEvent); if (index==0) - msprintf(&cmdbuf, "NEWT %d:%d:%s:%s:%s:%d:%d:%s:%s", + msprintf(&cmdbuf, "NEWT %d:%d:%s:%s:%s:%d:%d:d:%s:%s", Flags, Timer->Channel()->Number(), #if VDRVERSNUM < 10503 @@ -634,6 +636,7 @@ bufEnd, Prio, Lifetime, + Act, Timer->File(), tmpSummary?tmpSummary:""); else @@ -650,6 +653,7 @@ bufEnd, Prio, Lifetime, + Act, Timer->File(), tmpSummary?tmpSummary:""); @@ -785,7 +789,7 @@ strftime(stopbuffer, DAYBUFFERSIZE, "%H%M", &tm_r_stop); char* cmdbuf = NULL; - msprintf(&cmdbuf, "MODT %d %d:%d:%s:%s:%s:%d:%d:%s:%s", + msprintf(&cmdbuf, "MODT %d %d:%d:%s:%s:%s:%d:%d:%d:%s:%s", timer->Index()+1, timer->Flags(), timer->Channel()->Number(), @@ -794,6 +798,7 @@ stopbuffer, timer->Priority(), timer->Lifetime(), + timer->Action(), timer->File(), timer->Aux()); diff -Naur epgsearch-0.9.24.org/searchtimer_thread.h epgsearch-0.9.24/searchtimer_thread.h --- epgsearch-0.9.24.org/searchtimer_thread.h 2008-04-13 14:53:44.000000000 -0400 +++ epgsearch-0.9.24/searchtimer_thread.h 2008-09-11 10:20:23.000000000 -0400 @@ -51,7 +51,7 @@ protected: virtual void Action(void); - bool AddModTimer(cTimer* Timer, int, cSearchExt*, const cEvent*, int Prio, int Lifetime, char* Summary = NULL, uint timerMod = tmNoChange); + bool AddModTimer(cTimer* Timer, int, cSearchExt*, const cEvent*, int Prio, int Lifetime, int Act, char* Summary = NULL, uint timerMod = tmNoChange); void RemoveTimer(cTimer* Timer, const cEvent* Event = NULL); void Stop(void); bool NeedUpdate();