show switch timers in search results menus

4 files changed, 13 insertions, 1 deletions

diff --git a/HISTORY b/HISTORY
index b9f5ece..0e8a260 100644
--- a/HISTORY
+++ b/HISTORY
@@ -89,6 +89,7 @@ new:
   automatically activate the setting "Use search timers" in the setup.
 - epgsearch now also checks the recordings length among the correct start and stop time of a timer
   when testing for complete recordings. 98% and more are handled as complete. 
+- switch timers are now also visible in all search results EPG menus
 
 fixes:
 - fixed a crash when pressing 'Ok' in an empty timers done menu
diff --git a/HISTORY.DE b/HISTORY.DE
index c0bc7b0..7ded036 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -93,6 +93,7 @@ neu:
   Option "Suchtimer verw." im Setup.
 - epgsearch prüft nun neben korrekter Start- und Stopzeit des Timers auch die Aufnahmelänge 
   bei der Prüfung auf vollständige Aufnahmen. 98% und mehr gelten als vollständig.
+- Umschalttimer sind nun ebenfalls in alle EPG-Menüs mit Suchergebnissen sichtbar.
 
 fixes:
 - Absturz beim Drücken von 'Ok' in leerem Menü erledigter Timer behoben
diff --git a/menu_searchresults.c b/menu_searchresults.c
index 5f509dd..aba990b 100644
--- a/menu_searchresults.c
+++ b/menu_searchresults.c
@@ -39,6 +39,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "menu_deftimercheckmethod.h"
 #include "afuzzy.h"
 #include "timerstatus.h"
+#include "switchtimer.h"
 
 const char* ButtonBlue[3] = {NULL, NULL, NULL};
 extern int gl_InfoConflict;
@@ -61,6 +62,7 @@ cMenuSearchResultsItem::cMenuSearchResultsItem(const cEvent *EventInfo, bool Epi
    previewTimer = PreviewTimer;
    menuTemplate = MenuTemplate?MenuTemplate:cTemplFile::GetTemplateByName("MenuSearchResults");
    search = Search;
+   inSwitchList = false;
    Update(true);
 }
 
@@ -72,12 +74,14 @@ bool cMenuSearchResultsItem::Update(bool Force)
    bool result = false;
 
    int OldTimerMatch = timerMatch;
+   bool OldInSwitchList = inSwitchList;
    bool hasMatch = false; 
    cTimer* timer = NULL;
    if (event) timer = Timers.GetMatch(event, &timerMatch);
+   if (event) inSwitchList = (SwitchTimers.InSwitchList(event)!=NULL);
    if (timer) hasMatch = true;
     
-   if (Force || timerMatch != OldTimerMatch) 
+   if (Force || timerMatch != OldTimerMatch || inSwitchList != OldInSwitchList)  
    {
      char t[Utf8BufSize(2)]="",v[Utf8BufSize(2)]="",r[Utf8BufSize(2)]="";
      char szStatus[Utf8BufSize(4)] = "";
@@ -112,6 +116,11 @@ bool cMenuSearchResultsItem::Update(bool Force)
          r[0] = event && event->IsRunning() ? '*' : ' ';
          r[1] = '\0';
       }
+      if (event && inSwitchList)
+      {
+         cSwitchTimer* s = SwitchTimers.InSwitchList(event);
+	 t[0] = (s && s->mode==1)?'s':'S';
+      }
       if (t[0] != 'T' && previewTimer)
          t[0] = 'P';
 	
diff --git a/menu_searchresults.h b/menu_searchresults.h
index 087de34..3571f38 100644
--- a/menu_searchresults.h
+++ b/menu_searchresults.h
@@ -51,6 +51,7 @@ class cMenuSearchResultsItem : public cOsdItem {
     cMenuTemplate* menuTemplate;
  public: 
     int timerMatch;
+    bool inSwitchList;
     const cEvent *event;
     const cSearchExt* search;
     const char *FileName(void) { return fileName; }