summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY4
-rw-r--r--HISTORY.DE4
-rw-r--r--epgsearch.c2
-rw-r--r--searchtimer_thread.c5
4 files changed, 10 insertions, 5 deletions
diff --git a/HISTORY b/HISTORY
index b086c17..a3fea36 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,7 +2,7 @@ VDR Plugin 'epgsearch' Revision History
---------------------------------------
2008-xx-xx: Version 0.9.24
new:
-- support for vdr-1.6.x
+- support for vdr-1.6.x/1.7.x
- speedup in searching and search timer updates (about 25%)
- speedup in EPG menues, thanks to patch authors from http://www.open7x0.org
- support for VDRSymbols font (activate it with 'WarEagle=1' in epgsearchmenu.conf)
@@ -35,6 +35,8 @@ new:
nachofr from todopvr.com, and especially to bittor
- update of italian translation, thanks to Diego from vdr-italia.phpbb24.com
- update of dutch translation, thanks to carel@bugtracker
+- the setup option "No announcements when replaying" is now ignored, if the search timer
+ update was triggered manually, suggested by Andreas Mair.
fixes:
- shifting the time display: the start time now only gets displayed in
diff --git a/HISTORY.DE b/HISTORY.DE
index 0fa41ef..26c3db6 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -3,7 +3,7 @@ VDR Plugin 'epgsearch' Revision History
2008-xx-xx: Version 0.9.24
neu:
-- Unterstützung von vdr-1.6.x
+- Unterstützung von vdr-1.6.x/1.7.x
- Die Suche und damit das Suchtimer-Update sind nun etwa 25% schneller
- Schnellere EPG-Menüs, danke an die Patch-Authoren von http://www.open7x0.org
- Unterstützung des VDRSymbols-Font (aktivieren mit 'WarEagle=1' in epgsearchmenu.conf)
@@ -40,6 +40,8 @@ neu:
nachofr von todopvr.com, und ein besonderer Dank an bittor
- Update der italienischen Übersetzung, Danke an Diego von vdr-italia.phpbb24.com
- Update der niederländischen Übersetzung, Danke an carel@bugtracker
+- Die Setup-Option "Keine Ankündigungen bei Wiedergabe" wird jetzt ignoriert, wenn das
+ Suchtimer-Update manuell gestartet wurde, vorgeschlagen von Andreas Mair.
fixes:
- Shiften der Uhrzeit: die Startzeit wird jetzt nur noch dann anstelle des
diff --git a/epgsearch.c b/epgsearch.c
index a502abd..bfb30c6 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -66,7 +66,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include "menu_announcelist.h"
#include "confdloader.h"
-static const char VERSION[] = "0.9.24.rc1";
+static const char VERSION[] = "0.9.24.rc2";
static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more");
// globals
diff --git a/searchtimer_thread.c b/searchtimer_thread.c
index 7f7a273..4461595 100644
--- a/searchtimer_thread.c
+++ b/searchtimer_thread.c
@@ -382,7 +382,7 @@ void cSearchTimerThread::Action(void)
{
if (t || // timer already exists or
NoAnnounces.InList(pEvent) || // announcement not wanted anymore or
- (EPGSearchConfig.noAnnounceWhileReplay && cDevice::PrimaryDevice()->Replaying()) // no announce while replay
+ (EPGSearchConfig.noAnnounceWhileReplay && cDevice::PrimaryDevice()->Replaying() && updateForced != 2) // no announce while replay within automatic updates
)
{
if (Summary) free(Summary);
@@ -493,7 +493,8 @@ void cSearchTimerThread::Action(void)
*DateTime(conflictCheck.nextRelevantConflictDate));
bool doMessage = EPGSearchConfig.noConflMsgWhileReplay == 0 ||
!cDevice::PrimaryDevice()->Replaying() ||
- conflictCheck.nextRelevantConflictDate - now < 2*60*60;
+ conflictCheck.nextRelevantConflictDate - now < 2*60*60 ||
+ updateForced == 2;
if (doMessage && SendMsg(msgfmt, true,7) == kOk)
{
m_plugin->showConflicts = true;