Update services/epgtimer.h

services/epgsearch.h

@@ -1,5 +1,5 @@
-/*
+/*                                                                  -*- c++ -*-
-Copyright (C) 2004-2007 Christian Wieninger
+Copyright (C) 2004-2013 Christian Wieninger
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -24,10 +24,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #ifndef EPGSEARCHSERVICES_INC
 #define EPGSEARCHSERVICES_INC
 
-// Added by Andreas Mair (mail _AT_ andreas _DOT_ vdr-developer _DOT_ org)
-#define EPGSEARCH_SEARCHRESULTS_SERVICE_STRING_ID "Epgsearch-searchresults-v1.0"
-#define EPGSEARCH_LASTCONFLICTINFO_SERVICE_STRING_ID "Epgsearch-lastconflictinfo-v1.0"
-
 #include <string>
 #include <list>
 #include <memory>
@@ -35,8 +31,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include <vdr/osdbase.h>
 
 // Data structure for service "Epgsearch-search-v1.0"
-struct Epgsearch_search_v1_0
+struct Epgsearch_search_v1_0 {
-{
 // in
     char* query;               // search term
     int mode;                  // search mode (0=phrase, 1=and, 2=or, 3=regular expression)
@@ -49,8 +44,7 @@ struct Epgsearch_search_v1_0
 };
 
 // Data structure for service "Epgsearch-exttimeredit-v1.0"
-struct Epgsearch_exttimeredit_v1_0
+struct Epgsearch_exttimeredit_v1_0 {
-{
 // in
     cTimer* timer;             // pointer to the timer to edit
     bool bNew;                 // flag that indicates, if this is a new timer or an existing one
@@ -59,32 +53,34 @@ struct Epgsearch_exttimeredit_v1_0
     cOsdMenu* pTimerMenu;   // pointer to the menu of results
 };
 
+// Data structure for service "Epgsearch-enablesearchtimers-v1.0"
+struct Epgsearch_enablesearchtimers_v1_0 {
+// in
+    bool enable;           // enable search timer thread?
+};
+
 // Data structure for service "Epgsearch-updatesearchtimers-v1.0"
-struct Epgsearch_updatesearchtimers_v1_0
+struct Epgsearch_updatesearchtimers_v1_0 {
-{
 // in
     bool showMessage;           // inform via osd when finished?
 };
 
 // Data structure for service "Epgsearch-osdmessage-v1.0"
-struct Epgsearch_osdmessage_v1_0
+struct Epgsearch_osdmessage_v1_0 {
-{
 // in
     char* message;             // the message to display
     eMessageType type;
 };
 
 // Data structure for service "EpgsearchMenu-v1.0"
-struct EpgSearchMenu_v1_0
+struct EpgSearchMenu_v1_0 {
-{
 // in
 // out
     cOsdMenu* Menu;   // pointer to the menu
 };
 
 // Data structure for service "Epgsearch-lastconflictinfo-v1.0"
-struct Epgsearch_lastconflictinfo_v1_0
+struct Epgsearch_lastconflictinfo_v1_0 {
-{
 // in
 // out
     time_t nextConflict;       // next conflict date, 0 if none
@@ -93,8 +89,7 @@ struct Epgsearch_lastconflictinfo_v1_0
 };
 
 // Data structure for service "Epgsearch-searchresults-v1.0"
-struct Epgsearch_searchresults_v1_0
+struct Epgsearch_searchresults_v1_0 {
-{
 // in
     char* query;               // search term
     int mode;                  // search mode (0=phrase, 1=and, 2=or, 3=regular expression)
@@ -115,11 +110,10 @@ struct Epgsearch_searchresults_v1_0
 };
 
 // Data structure for service "Epgsearch-switchtimer-v1.0"
-struct Epgsearch_switchtimer_v1_0
+struct Epgsearch_switchtimer_v1_0 {
-{
 // in
     const cEvent* event;
-      int mode;                  // mode (0=query existance, 1=add/modify, 2=delete)
+    int mode;                  // mode (0=query existence, 1=add/modify, 2=delete)
 // in/out
     int switchMinsBefore;
     int announceOnly;
@@ -158,10 +152,51 @@ class cServiceHandler
     virtual bool WriteSetupValue(const std::string& entry, const std::string& value) = 0;
 };
 
-struct Epgsearch_services_v1_0
+struct Epgsearch_services_v1_0 {
-{
 // in/out
+#if __cplusplus < 201103L
+    std::auto_ptr<cServiceHandler> handler;
+#else
     std::unique_ptr<cServiceHandler> handler;
+#endif
+};
+
+// Data structures for service "Epgsearch-services-v1.1"
+class cServiceHandler_v1_1 : public cServiceHandler
+{
+public:
+    // Get timer conflicts
+    virtual std::list<std::string> TimerConflictList(bool relOnly = false) = 0;
+    // Check if a conflict check is advised
+    virtual bool IsConflictCheckAdvised() = 0;
+};
+
+struct Epgsearch_services_v1_1 {
+// in/out
+#if __cplusplus < 201103L
+    std::auto_ptr<cServiceHandler_v1_1> handler;
+#else
+    std::unique_ptr<cServiceHandler_v1_1> handler;
+#endif
+};
+
+// Data structures for service "Epgsearch-services-v1.2"
+class cServiceHandler_v1_2 : public cServiceHandler_v1_1
+{
+public:
+    // List of all recording directories used in recordings, timers (and optionally search timers or in epgsearchdirs.conf)
+    virtual std::set<std::string> ShortDirectoryList() = 0;
+    // Evaluate an expression against an event
+    virtual std::string Evaluate(const std::string& expr, const cEvent* event) = 0;
+};
+
+struct Epgsearch_services_v1_2 {
+// in/out
+#if __cplusplus < 201103L
+    std::auto_ptr<cServiceHandler_v1_2> handler;
+#else
+    std::unique_ptr<cServiceHandler_v1_2> handler;
+#endif
 };
 
 #endif

skindesigner.c

@@ -20,7 +20,7 @@
 #endif
 
 
-static const char *VERSION        = "1.2.8";
+static const char *VERSION        = "1.2.8.3";
 static const char *DESCRIPTION    = trNOOP("Skin Designer");
 
 class cPluginSkinDesigner : public cPlugin, public skindesignerapi::SkindesignerAPI {