Push to Version 2.4.0v2.4.0

5 files changed, 63 insertions, 17 deletions

diff --git a/HISTORY b/HISTORY
index 7248d70..de6ad56 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,28 @@
 VDR Plugin 'epgsearch' Revision History
 ---------------------------------------
 
+2018-04-16; Version 2.4.0
+new:
+- Create man pages only once. by jasminj@vdr-portal.de
+- Remove useless member "useEpisode" from cBlacklist by jasminj@vdr-portal.de
+- Remove useless member "useEpisode" from cBlacklist by jasminj@vdr-portal.de
+- Remove useless "LOCK_CHANNELS_READ" in cBlacklist run by jasminj@vdr-portal.de
+- Change shell in docsrc2*.sh to /bin/bash, suggested by TomJoad@vdr-portal.de
+- Added operator to cListObject derived classes by jasminj@vdr-portal.de
+- Add patches/vdr.epgsearch-exttimeredit-2.3.5.diff by Dietmar Spingler <d_spingler@gmx.de>
+- Adapt new makefile style of VDR 2.3.6 by TomJoad@vdr-portal.de
+- Use vdr timerids instead of index by TomJoad@vdr-portal.de
+- Fix many lock sequences by TomJoad@vdr-portal.de
+- New vdr.epgsearch-exttimeredit-2.3.6.diff (thx to Claus Muus)
+- Add conflict check for remote timers by Johann Friedrichs <johann.friedrichs@web.de>
+- Search timers should create only local timers
+- Use namespace for svdrpclient
+- Add icon for inactive timer
+- Use separate thread for recdone processing
+- get rid of some casts
+- unified indentation
+- Preserve timerflags in searchtimerupdate
+
 2017-05-xx; Version 2.3.1 - development release
 new:
 - Commit vdr-2.3.2-epgsearch-1.0.1.beta5~git20150715_v2.diff by fnu@vdr-portal.de
diff --git a/HISTORY.DE b/HISTORY.DE
index a5044ae..bb09f29 100644
--- a/HISTORY.DE
+++ b/HISTORY.DE
@@ -1,6 +1,28 @@
 VDR Plugin 'epgsearch' Revision History
 ---------------------------------------
 
+2018-04-16; Version 2.4.0
+neu:
+- Create man pages only once. by jasminj@vdr-portal.de
+- Remove useless member "useEpisode" from cBlacklist by jasminj@vdr-portal.de
+- Remove useless member "useEpisode" from cBlacklist by jasminj@vdr-portal.de
+- Remove useless "LOCK_CHANNELS_READ" in cBlacklist run by jasminj@vdr-portal.de
+- Change shell in docsrc2*.sh to /bin/bash, suggested by TomJoad@vdr-portal.de
+- Added operator to cListObject derived classes by jasminj@vdr-portal.de
+- Add patches/vdr.epgsearch-exttimeredit-2.3.5.diff by Dietmar Spingler <d_spingler@gmx.de>
+- Adapt new makefile style of VDR 2.3.6 by TomJoad@vdr-portal.de
+- Use vdr timerids instead of index by TomJoad@vdr-portal.de
+- Fix many lock sequences by TomJoad@vdr-portal.de
+- New vdr.epgsearch-exttimeredit-2.3.6.diff (thx to Claus Muus)
+- Add conflict check for remote timers by Johann Friedrichs <johann.friedrichs@web.de>
+- Search timers should create only local timers
+- Use namespace for svdrpclient
+- Add icon for inactive timer
+- Use separate thread for recdone processing
+- get rid of some casts
+- unified indentation
+- Preserve timerflags in searchtimerupdate
+
 2017-05-xx; Version 2.3.1 - development release
 neu:
 - Anwenden vdr-2.3.2-epgsearch-1.0.1.beta5~git20150715_v2.diff von fnu@vdr-portal.de
diff --git a/epgsearch.c b/epgsearch.c
index 1d76cdb..0d5ca6b 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -73,7 +73,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #error "VDR-2.3.6 API version or greater is required!"
 #endif
 
-static const char VERSION[]        = "2.3.1";
+static const char VERSION[]        = "2.4.0";
 static const char DESCRIPTION[]    =  trNOOP("search the EPG for repeats and more");
 
 // globals
diff --git a/patches/MainMenuHooks-v1_0_1.diff.gz b/patches/MainMenuHooks-v1_0_1.diff.gz
index c056a03..c248185 100644
--- a/patches/MainMenuHooks-v1_0_1.diff.gz
+++ b/patches/MainMenuHooks-v1_0_1.diff.gz
diff --git a/patches/vdr.epgsearch-exttimeredit-2.3.6.diff b/patches/vdr.epgsearch-exttimeredit-2.4.0.diff
index 36dc30d..cdc379e 100644
--- a/patches/vdr.epgsearch-exttimeredit-2.3.6.diff
+++ b/patches/vdr.epgsearch-exttimeredit-2.4.0.diff
@@ -1,6 +1,8 @@
---- a/menu.c.orig	2017-06-04 19:18:37.423036244 +0200
-+++ b/menu.c	2017-06-09 21:33:53.775782116 +0200
-@@ -1155,6 +1155,7 @@
+diff --git a/menu.c b/menu.c
+index c8a557c..ae2dc30 100644
+--- a/menu.c
++++ b/menu.c
+@@ -1159,6 +1159,7 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
  class cMenuTimerItem : public cOsdItem {
  private:
    const cTimer *timer;
@@ -8,7 +10,7 @@
  public:
    cMenuTimerItem(const cTimer *Timer);
    virtual int Compare(const cListObject &ListObject) const;
-@@ -1166,7 +1167,7 @@
+@@ -1170,7 +1171,7 @@ public:
  cMenuTimerItem::cMenuTimerItem(const cTimer *Timer)
  {
    timer = Timer;
@@ -17,7 +19,7 @@
  }
  
  int cMenuTimerItem::Compare(const cListObject &ListObject) const
-@@ -1176,6 +1177,20 @@
+@@ -1180,6 +1181,20 @@ int cMenuTimerItem::Compare(const cListObject &ListObject) const
  
  void cMenuTimerItem::Set(void)
  {
@@ -38,7 +40,7 @@
    cString day, name("");
    if (timer->WeekDays())
       day = timer->PrintDay(0, timer->WeekDays(), false);
-@@ -1223,8 +1238,7 @@
+@@ -1227,8 +1242,7 @@ private:
    cStateKey timersStateKey;
    int helpKeys;
    void Set(void);
@@ -48,23 +50,23 @@
    eOSState Delete(void);
    eOSState OnOff(void);
    eOSState Info(void);
-@@ -1316,21 +1330,34 @@
+@@ -1322,21 +1336,34 @@ eOSState cMenuTimers::OnOff(void)
    return osContinue;
  }
  
 -eOSState cMenuTimers::Edit(void)
-+eOSState cMenuTimers::Edit(bool New)
- {
+-{
 -  if (HasSubMenu() || Count() == 0)
-+  if (HasSubMenu() || Count() == 0 && !New)
-      return osContinue;
+-     return osContinue;
 -  return AddSubMenu(new cMenuEditTimer(GetTimer()));
 -}
 -
 -eOSState cMenuTimers::New(void)
--{
++eOSState cMenuTimers::Edit(bool New)
+ {
 -  if (HasSubMenu())
--     return osContinue;
++  if (HasSubMenu() || Count() == 0 && !New)
+      return osContinue;
 -  cTimer *Timer = new cTimer;
 +  cTimer *Timer;
 +  if (New)
@@ -94,7 +96,7 @@
  }
  
  eOSState cMenuTimers::Delete(void)
-@@ -1386,7 +1413,7 @@
+@@ -1392,7 +1419,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
       switch (Key) {
         case kOk:     return Edit();
         case kRed:    state = OnOff(); break; // must go through SetHelpKeys()!
@@ -103,8 +105,8 @@
         case kYellow: state = Delete(); break;
         case kInfo:
         case kBlue:   return Info();
-@@ -1400,6 +1427,14 @@
-      Add(new cMenuTimerItem(Timer), true);
+@@ -1410,6 +1437,14 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
+      SetHelpKeys();
       Display();
       }
 +  if (!HasSubMenu()) {