summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--HISTORY2
-rw-r--r--HISTORY.DE2
-rw-r--r--epgsearch.c9
-rw-r--r--epgsearch.h1
-rw-r--r--epgsearchext.c1
-rw-r--r--epgsearchsvdrp.c19
-rw-r--r--epgsearchtools.h3
-rw-r--r--menu_searchactions.c2
-rw-r--r--po/ca_ES.po5
-rw-r--r--po/cs_CZ.po5
-rw-r--r--po/da_DK.po5
-rw-r--r--po/de_DE.po5
-rw-r--r--po/el_GR.po5
-rw-r--r--po/es_ES.po6
-rw-r--r--po/et_EE.po5
-rw-r--r--po/fi_FI.po6
-rw-r--r--po/fr_FR.po6
-rw-r--r--po/hr_HR.po5
-rw-r--r--po/hu_HU.po5
-rw-r--r--po/it_IT.po6
-rw-r--r--po/nl_NL.po6
-rw-r--r--po/nn_NO.po5
-rw-r--r--po/pl_PL.po6
-rw-r--r--po/pt_PT.po5
-rw-r--r--po/ro_RO.po5
-rw-r--r--po/ru_RU.po5
-rw-r--r--po/sl_SI.po5
-rw-r--r--po/sv_SE.po5
-rw-r--r--po/tr_TR.po5
-rw-r--r--searchtimer_thread.c9
-rw-r--r--searchtimer_thread.h1
31 files changed, 129 insertions, 31 deletions
diff --git a/HISTORY b/HISTORY
index 0bfcd1c..3165ed2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -24,6 +24,8 @@ new:
their episode names match and are not empty. Caution: if your EPG data has no episode
names for different episodes don't use this option! 'yes' will then be the better
choice even if this results in double recordings.
+- epgsearch now uses the shutdown handler (introduced in vdr 1.5.1) to prevent a
+ search timer update to be interrupted.
fixes:
- fixed a crash when pressing 'Ok' in an empty timers done menu
- fixed a crash when using the progressbar and events with 0 duration exist, thanks
diff --git a/HISTORY.DE b/HISTORY.DE
index b1bc1ae..ca46020 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -26,6 +26,8 @@ neu:
EPG-Daten keine Untertitel für unterschiedliche Folgen enthalten, sollte diese Option
nicht verwendet werden. 'ja' ist in diesem Fall besser, selbst wenn dadurch doppelt
aufgezeichnet werden kann.
+- epgsearch verwendet nun den shutdown handler (eingeführt in vdr 1.5.1) um die Unter-
+ brechung eines Suchtimerupdates zu verhindern.
fixes:
- Absturz beim Drücken von 'Ok' in leerem Menü erledigter Timer behoben
diff --git a/epgsearch.c b/epgsearch.c
index e83578a..767e8b7 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -69,7 +69,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include <langinfo.h>
#endif
-static const char VERSION[] = "0.9.25.beta7";
+static const char VERSION[] = "0.9.25.beta8";
static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more");
// globals
@@ -263,7 +263,7 @@ bool cPluginEpgsearch::Service(const char *Id, void *Data)
else
{
Epgsearch_updatesearchtimers_v1_0* serviceData = (Epgsearch_updatesearchtimers_v1_0*) Data;
- updateForced = serviceData->showMessage?2:1;
+ updateForced = serviceData->showMessage?3:1;
}
return true;
}
@@ -691,5 +691,10 @@ bool cPluginEpgsearch::SetupParse(const char *Name, const char *Value)
return true;
}
+cString cPluginEpgsearch::Active(void)
+{
+ return cSearchTimerThread::justRunning?tr("search timer update running"):NULL;
+}
+
VDRPLUGINCREATOR(cPluginEpgsearch); // Don't touch this!
diff --git a/epgsearch.h b/epgsearch.h
index 80b7b4f..930e7b0 100644
--- a/epgsearch.h
+++ b/epgsearch.h
@@ -53,6 +53,7 @@ public:
void LoadUserVars();
void LoadConfD();
void CheckUTF8();
+ virtual cString Active(void);
};
#endif
diff --git a/epgsearchext.c b/epgsearchext.c
index 8564be7..38db993 100644
--- a/epgsearchext.c
+++ b/epgsearchext.c
@@ -46,7 +46,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
cSearchExts SearchExts;
cSearchExts SearchTemplates;
-extern bool updateForced;
#define MAX_SUBTITLE_LENGTH 40
diff --git a/epgsearchsvdrp.c b/epgsearchsvdrp.c
index 865e358..98e8678 100644
--- a/epgsearchsvdrp.c
+++ b/epgsearchsvdrp.c
@@ -66,7 +66,7 @@ const char **cPluginEpgsearch::SVDRPHelpPages(void)
"UPDS [ OSD ]\n"
" Update search timers.\n"
" If the optional keyword 'OSD' is passed, an OSD message\n"
- " will inform about update completion.",
+ " will inform about update completion.",
"UPDD\n"
" Reload epgsearchdone.data",
"SETS <ON|OFF>\n"
@@ -141,8 +141,21 @@ cString cPluginEpgsearch::SVDRPCommand(const char *Command, const char *Option,
{
if (strcasecmp(Command, "UPDS") == 0)
{
- updateForced = (Option && strcasecmp(Option, "OSD") == 0)?2:1;
- return cString("update triggered");
+ updateForced = 1;
+ if (Option)
+ {
+ char *pstrOptionToken, *pptr;
+ char *pstrOptions=strdup(Option);
+ pstrOptionToken=strtok_r(pstrOptions, " ", &pptr);
+ while(pstrOptionToken)
+ {
+ if (strcasecmp(Option, "OSD")==0)
+ updateForced |= UPDS_WITH_OSD;
+ pstrOptionToken=strtok_r(NULL, "|", &pptr);
+ }
+ free(pstrOptions);
+ }
+ return cString("update triggered");
}
else if (strcasecmp(Command, "UPDD") == 0)
{
diff --git a/epgsearchtools.h b/epgsearchtools.h
index 6f9d3ad..c0fb9bf 100644
--- a/epgsearchtools.h
+++ b/epgsearchtools.h
@@ -76,6 +76,9 @@ using std::string;
#define ISRADIO(x) ((x)->Vpid()==0||(x)->Vpid()==1||(x)->Vpid()==0x1fff)
+#define UPDS_WITH_OSD (1<<1)
+#define UPDS_WITH_EPGSCAN (1<<2)
+#define UPDS_WITH_NOBREAK (1<<3)
#if APIVERSNUM >= 10503
// Icons used in VDRSymbols-Font
diff --git a/menu_searchactions.c b/menu_searchactions.c
index 9021b18..7a85994 100644
--- a/menu_searchactions.c
+++ b/menu_searchactions.c
@@ -121,7 +121,7 @@ eOSState cMenuSearchActions::Execute()
Skins.Message(mtInfo, tr("Search timers activated in setup."));
}
if (Interface->Confirm(tr("Run search timer update?")))
- updateForced = 2; // with message about completion
+ updateForced = 3; // with message about completion
return osBack;
}
if (current == 3)
diff --git a/po/ca_ES.po b/po/ca_ES.po
index c104491..34cd9ff 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -72,6 +72,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 35c6bf4..d78e3d1 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/da_DK.po b/po/da_DK.po
index bcbdb2b..2723047 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 560306d..e0e4c70 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,9 @@ msgstr "Suche im EPG nach Wiederholungen und anderem"
msgid "Program guide"
msgstr "Programmführer"
+msgid "search timer update running"
+msgstr "Suchtimer-Update läuft"
+
msgid "Direct access to epgsearch's search menu"
msgstr "Direkter Zugriff auf epgsearch's Suchenmenu"
diff --git a/po/el_GR.po b/po/el_GR.po
index 17ab922..32935dc 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/es_ES.po b/po/es_ES.po
index f782d1d..0894f2e 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-11-18 20:09+0200\n"
"Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,10 @@ msgstr "Buscar repeticiones en la EPG"
msgid "Program guide"
msgstr "Guía de Programación"
+#, fuzzy
+msgid "search timer update running"
+msgstr "¡Programación por búsqueda actualizada!"
+
msgid "Direct access to epgsearch's search menu"
msgstr "Acceso directo al menú de búsqueda EPGSearch"
diff --git a/po/et_EE.po b/po/et_EE.po
index 3f7bf6f..a8a48d5 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 469b342..b782dac 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Rolf Ahrenberg <rahrenbe@cc.hut.fi>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -73,6 +73,10 @@ msgstr "Monipuolinen ohjelmaopas hakutoiminnolla"
msgid "Program guide"
msgstr "Ohjelmaopas"
+#, fuzzy
+msgid "search timer update running"
+msgstr "Hakuajastimet päivitetty!"
+
msgid "Direct access to epgsearch's search menu"
msgstr "Suoratoiminto EPGSearch-laajennoksen haulle"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index ec8cc2c..1fb34a7 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2008-04-30 08:36+0200\n"
"Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -73,6 +73,10 @@ msgstr "Recherche de répétition dans EPG"
msgid "Program guide"
msgstr "Guide du programme"
+#, fuzzy
+msgid "search timer update running"
+msgstr "La mise à jours de recherche est effectuée!"
+
msgid "Direct access to epgsearch's search menu"
msgstr "Accès direct dans epgsearch dans le menu recherche"
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 5b09118..7fdc07a 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -71,6 +71,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 7cbe07d..a6099a1 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -71,6 +71,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 28a2f37..f5adf66 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2008-06-29 03:25+0100\n"
"Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -72,6 +72,10 @@ msgstr "Cerca nella guida EPG: per parole, repliche e altro"
msgid "Program guide"
msgstr "Guida programmi"
+#, fuzzy
+msgid "search timer update running"
+msgstr "Aggiornamento timer ricerca completato!"
+
msgid "Direct access to epgsearch's search menu"
msgstr "Accesso diretto al menu di ricerca di epgsearch"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 186e5bb..554f1d4 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -72,6 +72,10 @@ msgstr "Zoek in de EPG naar herhalingen en meer"
msgid "Program guide"
msgstr "Programmagids"
+#, fuzzy
+msgid "search timer update running"
+msgstr "Verversen zoektimer gereed!"
+
msgid "Direct access to epgsearch's search menu"
msgstr "Direct toegang tot epgsearch's zoek menu"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 6b6255f..17a064c 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -71,6 +71,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/pl_PL.po b/po/pl_PL.po
index eec0a9e..765d6c2 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,10 @@ msgstr ""
msgid "Program guide"
msgstr ""
+#, fuzzy
+msgid "search timer update running"
+msgstr "/oui"
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 6c56f08..c1a04f4 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/ro_RO.po b/po/ro_RO.po
index f3ded08..804f651 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -71,6 +71,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 201679d..103ddd5 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/sl_SI.po b/po/sl_SI.po
index dee8031..e988b39 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -71,6 +71,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 1469022..f623559 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -71,6 +71,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/po/tr_TR.po b/po/tr_TR.po
index bd43010..1a86d2b 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VDR 1.5.7\n"
"Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2008-12-03 18:23+0100\n"
+"POT-Creation-Date: 2009-01-03 20:30+0100\n"
"PO-Revision-Date: 2007-08-14 20:21+0200\n"
"Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
"Language-Team: <vdr@linuxtv.org>\n"
@@ -70,6 +70,9 @@ msgstr ""
msgid "Program guide"
msgstr ""
+msgid "search timer update running"
+msgstr ""
+
msgid "Direct access to epgsearch's search menu"
msgstr ""
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index eb20218..3e17ade 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -53,6 +53,7 @@ extern int updateForced;
cSearchTimerThread *cSearchTimerThread::m_Instance = NULL;
cSearchResults cSearchTimerThread::announceList;
+bool cSearchTimerThread::justRunning = false;
cSearchTimerThread::cSearchTimerThread(cPluginEpgsearch* thePlugin)
: cThread("EPGSearch: searchtimer")
@@ -208,6 +209,7 @@ void cSearchTimerThread::Action(void)
bool needUpdate = NeedUpdate();
if (now >= nextUpdate || needUpdate)
{
+ justRunning = true;
if (Timers.BeingEdited())
{
Wait.Wait(1000);
@@ -394,7 +396,7 @@ void cSearchTimerThread::Action(void)
NoAnnounces.InList(pEvent) || // announcement not wanted anymore or
(EPGSearchConfig.noAnnounceWhileReplay &&
cDevice::PrimaryDevice()->Replaying() && cDevice::PrimaryDevice()->Transferring() &&
- updateForced != 2) // no announce while replay within automatic updates
+ !(updateForced & UPDS_WITH_OSD)) // no announce while replay within automatic updates
)
{
if (Summary) free(Summary);
@@ -506,7 +508,7 @@ void cSearchTimerThread::Action(void)
bool doMessage = EPGSearchConfig.noConflMsgWhileReplay == 0 ||
!cDevice::PrimaryDevice()->Replaying() ||
conflictCheck.nextRelevantConflictDate - now < 2*60*60 ||
- updateForced == 2;
+ (updateForced & UPDS_WITH_OSD);
if (doMessage && SendMsg(msgfmt, true,7) == kOk)
{
m_plugin->showConflicts = true;
@@ -526,7 +528,7 @@ void cSearchTimerThread::Action(void)
if (m_Active)
mailNotifier.SendUpdateNotifications();
- if (updateForced == 2 && m_Active)
+ if ((updateForced & UPDS_WITH_OSD) && m_Active)
SendMsg(tr("Search timer update done!"));
// reset service call flag
@@ -534,6 +536,7 @@ void cSearchTimerThread::Action(void)
m_lastUpdate = time(NULL);
nextUpdate = long(m_lastUpdate/60)*60 + (EPGSearchConfig.UpdateIntervall * 60);
+ justRunning = false;
}
if (m_Active)
Wait.Wait(2000); // to avoid high system load if time%30==0
diff --git a/searchtimer_thread.h b/searchtimer_thread.h
index 7c0782e..92cc6de 100644
--- a/searchtimer_thread.h
+++ b/searchtimer_thread.h
@@ -62,6 +62,7 @@ class cSearchTimerThread: public cThread {
static char* SummaryExtended(cSearchExt* searchExt, cTimer* Timer, const cEvent* pEvent);
static cSearchTimerThread *m_Instance;
static cTimer* GetTimer(cSearchExt *searchExt, const cEvent *pEvent, bool& bTimesMatchExactly);
+ static bool justRunning;
cSearchTimerThread(cPluginEpgsearch* thePlugin);
virtual ~cSearchTimerThread();
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-24 03:01:19 +0000