2018-02-17 version 1.1.85 (horchi)\n - added: Timer type and location to timer detail service\n\n1.1.85

6 files changed, 30 insertions, 21 deletions

diff --git a/HISTORY.h b/HISTORY.h
index e9061a2..bd56308 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
  *
  */
 
-#define _VERSION     "1.1.84"
-#define VERSION_DATE "13.02.2018"
+#define _VERSION     "1.1.85"
+#define VERSION_DATE "17.02.2018"
 
 #define DB_API       6
 
@@ -19,6 +19,9 @@
 /*
  * ------------------------------------
 
+2018-02-17 version 1.1.85 (horchi)
+   - added: Timer type and location to timer detail service
+
 2018-02-13 version 1.1.84 (horchi)
    - added: Timer 'type' to timers menu
 
diff --git a/epg2vdr.c b/epg2vdr.c
index f51dc53..612664f 100644
--- a/epg2vdr.c
+++ b/epg2vdr.c
@@ -871,7 +871,7 @@ bool cPluginEPG2VDR::Service(const char* id, void* data)
       return true;
    }
 
-   if (strcmp(id, EPG2VDR_TIMER_SERVICE) == 0 || strcmp(id, EPG2VDR_REC_DETAIL_SERVICE) == 0 || strcmp(id, EPG2VDR_HAS_TIMER) == 0)
+   if (strcmp(id, EPG2VDR_TIMER_SERVICE) == 0 || strcmp(id, EPG2VDR_REC_DETAIL_SERVICE) == 0 || strcmp(id, EPG2VDR_TIMER_DETAIL_SERVICE) == 0)
    {
       // Services with direct db access
 
@@ -886,9 +886,9 @@ bool cPluginEPG2VDR::Service(const char* id, void* data)
             if (ts)
                return timerService(ts);
          }
-         if (strcmp(id, EPG2VDR_HAS_TIMER) == 0)
+         if (strcmp(id, EPG2VDR_TIMER_DETAIL_SERVICE) == 0)
          {
-            cHas_Timer_V1* d = (cHas_Timer_V1*)data;
+            cTimer_Detail_V1* d = (cTimer_Detail_V1*)data;
 
             if (d)
                return hasTimerService(d);
@@ -912,7 +912,7 @@ bool cPluginEPG2VDR::Service(const char* id, void* data)
 // Has Timer Service
 //***************************************************************************
 
-int cPluginEPG2VDR::hasTimerService(cHas_Timer_V1* d)
+int cPluginEPG2VDR::hasTimerService(cTimer_Detail_V1* d)
 {
    cMutexLock lock(&mutexTimerService);
 
@@ -920,12 +920,17 @@ int cPluginEPG2VDR::hasTimerService(cHas_Timer_V1* d)
    vdrDb->clear();
 
    d->hastimer = no;
+   d->local = yes;
+   d->type = ttRecord;
 
    for (int f = selectTimers->find(); f && connection->check() == success; f = selectTimers->fetch())
    {
       if (timerDb->hasValue("EVENTID", d->eventid))
       {
          d->hastimer = yes;
+         d->local = timerDb->hasValue("VDRUUID", Epg2VdrConfig.uuid);
+         d->type = timerDb->getValue("TYPE")->getCharValue();
+
          break;
       }
    }
diff --git a/epg2vdr.h b/epg2vdr.h
index 26ab2bd..7e5de45 100644
--- a/epg2vdr.h
+++ b/epg2vdr.h
@@ -64,7 +64,7 @@ class cPluginEPG2VDR : public cPlugin
       int exitDb();
 
       int timerService(cEpgTimer_Service_V1* ts);
-      int hasTimerService(cHas_Timer_V1* d);
+      int hasTimerService(cTimer_Detail_V1* d);
       int recordingDetails(cEpgRecording_Details_Service_V1* rd);
 
    private:
diff --git a/menusched.c b/menusched.c
index f62afd3..c343fdb 100644
--- a/menusched.c
+++ b/menusched.c
@@ -11,6 +11,8 @@
 #include <vdr/status.h>
 #include <vdr/menu.h>
 
+#include "lib/xml.h"
+
 #include "plgconfig.h"
 #include "menu.h"
 #include "ttools.h"
@@ -670,7 +672,7 @@ int cMenuEpgWhatsOn::LoadAt()
       return LoadSearch(userTime);
 
    Clear();
-//   Timers.Modified(timerState);
+   // Timers.Modified(timerState);
 
    SetMenuCategory(userTime->getMode() == cUserTimes::mNow ? mcScheduleNow : mcScheduleNext);
 
@@ -707,9 +709,6 @@ int cMenuEpgWhatsOn::LoadAt()
             }
          }
 
-         // #TODO
-         // hier ein cEpgEvent für das Event aus der Row erzeugen und dieses anstelle von cEvent für das Menü verwenden
-
          if (!Event && !Epg2VdrConfig.showEmptyChannels)
             continue;
 
diff --git a/service.h b/service.h
index d392d05..fcf1c2e 100644
--- a/service.h
+++ b/service.h
@@ -73,7 +73,7 @@ class cEpgTimer_Interface_V1 : public cTimer
 };
 
 //***************************************************************************
-// Timer Service Interface
+// Timer Service
 //***************************************************************************
 
 struct cEpgTimer_Service_V1
@@ -82,17 +82,19 @@ struct cEpgTimer_Service_V1
 };
 
 //***************************************************************************
-// Has Timer
+// Timer Detail Service
 //***************************************************************************
 
-struct cHas_Timer_V1
+struct cTimer_Detail_V1
 {
    long eventid;
    int hastimer;
+   int local;
+   char type;
 };
 
 //***************************************************************************
-// Recording Detail Service Interface
+// Recording Detail Service
 //***************************************************************************
 
 struct cEpgRecording_Details_Service_V1
@@ -101,17 +103,17 @@ struct cEpgRecording_Details_Service_V1
    std::string details;
 };
 
-#define EPG2VDR_TIMER_UPDATED      "Epg2Vdr_Timer_Updated-v1.0"
-#define EPG2VDR_TIMER_SERVICE      "Epg2Vdr_Timer_Service-v1.0"
-#define EPG2VDR_HAS_TIMER          "Epg2Vdr_Has_Timer_Service-v1.0"
-#define EPG2VDR_REC_DETAIL_SERVICE "Epg2Vdr_RecDetail_Service-v1.0"
+#define EPG2VDR_TIMER_UPDATED         "Epg2Vdr_Timer_Updated-v1.0"
+#define EPG2VDR_TIMER_SERVICE         "Epg2Vdr_Timer_Service-v1.0"
+#define EPG2VDR_TIMER_DETAIL_SERVICE  "Epg2Vdr_Timer_Detail_Service-v1.0"
+#define EPG2VDR_REC_DETAIL_SERVICE    "Epg2Vdr_RecDetail_Service-v1.0"
 
 #ifdef EPG2VDR
 
 //***************************************************************************
 //***************************************************************************
 //***************************************************************************
-// Internal Stuff
+// EPG2VDR Internal Stuff
 //***************************************************************************
 
 //***************************************************************************
diff --git a/update.c b/update.c
index 8db9183..1a39a1d 100644
--- a/update.c
+++ b/update.c
@@ -1801,7 +1801,7 @@ cEvent* cUpdate::createEventFromRow(const cDbRow* row)
          // finally add some fields of the view
 
          xml.appendElement("source", viewMergeSource->getStrValue());
-         xml.appendElement("longdescription", viewLongDescription->getStrValue());
+         xml.appendElement("longdescription", viewLongDescription->getStrValue()); // the real original without view additions
 
          // set to events aux field