version 0.0.3 - adapted libskindesigner0.0.3

8 files changed, 448 insertions, 11 deletions

diff --git a/HISTORY b/HISTORY
index 2cb4f17..b162e6d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -10,3 +10,7 @@ VDR Plugin 'weatherforecast' Revision History
   of forecast
 
 Version 0.0.2
+
+- adapted libskindesigner
+
+Version 0.0.3
diff --git a/Makefile b/Makefile
index fba7ca0..a246bea 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The directory environment:
 
 # Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
 PLGCFG = $(call PKGCFG,plgcfg)
@@ -59,10 +59,11 @@ LIBS += $(shell pkg-config --cflags --libs jansson)
 OBJS = $(PLUGIN).o \
        config.o \
        setup.o \
-	   libskindesigner/skindesignerosdbase.o \
-	   tools/curlfuncs.o \
-	   tools/jsonhelpers.o \
-	   tools/filesystem.o \
+       libskindesigner/skindesignerosdbase.o \
+       libskindesigner/osdelements.o \
+       tools/curlfuncs.o \
+       tools/jsonhelpers.o \
+       tools/filesystem.o \
        libforecastio/forecastio.o \
        libforecastio/forecasts.o \
        libforecastio/forecast.o \
diff --git a/libskindesigner/osdelements.c b/libskindesigner/osdelements.c
new file mode 100644
index 0000000..11915a8
--- /dev/null
+++ b/libskindesigner/osdelements.c
@@ -0,0 +1,203 @@
+#include "osdelements.h"
+
+/**********************************************************************
+* cOsdElement
+**********************************************************************/
+cOsdElement::cOsdElement(cSkinDisplayPlugin *view) {
+    this->view = view;
+}
+
+cOsdElement::~cOsdElement() {
+}
+
+void cOsdElement::ClearTokens(void) {
+    stringTokens.clear();
+    intTokens.clear();
+    loopTokens.clear();
+}
+
+void cOsdElement::AddStringToken(string key, string value) {
+    stringTokens.insert(pair<string,string>(key, value));
+}
+
+void cOsdElement::AddIntToken(string key, int value) {
+    intTokens.insert(pair<string,int>(key, value));
+}
+
+void cOsdElement::AddLoopToken(string loopName, map<string, string> &tokens) {
+    map<string, vector<map<string, string> > >::iterator hitLoop = loopTokens.find(loopName);
+    if (hitLoop == loopTokens.end()) {
+        vector<map<string, string> > tokenVector;
+        tokenVector.push_back(tokens);
+        loopTokens.insert(pair<string, vector<map<string, string> > >(loopName, tokenVector));
+    } else {
+        vector<map<string, string> > *tokenVector = &hitLoop->second;
+        tokenVector->push_back(tokens);
+    }
+}
+
+bool cOsdElement::ChannelLogoExists(string channelId) {
+    return view->ChannelLogoExists(channelId);
+}
+
+string cOsdElement::GetEpgImagePath(void) {
+    return view->GetEpgImagePath();    
+}
+
+
+/**********************************************************************
+* cViewElement
+**********************************************************************/
+cViewElement::cViewElement(cSkinDisplayPlugin *view, int viewElementID) : cOsdElement(view) {
+    this->viewElementID = viewElementID;
+}
+
+cViewElement::~cViewElement() {
+}
+
+void cViewElement::Clear(void) {
+    if (!view)
+        return;
+    view->ClearViewElement(viewElementID);
+}
+
+void cViewElement::Display(void) {
+    if (!view)
+        return;
+    view->SetViewElementIntTokens(&intTokens);
+    view->SetViewElementStringTokens(&stringTokens);
+    view->SetViewElementLoopTokens(&loopTokens);
+    view->DisplayViewElement(viewElementID);
+}
+
+/**********************************************************************
+* cViewGrid
+**********************************************************************/
+cViewGrid::cViewGrid(cSkinDisplayPlugin *view, int viewGridID) : cOsdElement(view) {
+    this->viewGridID = viewGridID;
+}
+
+cViewGrid::~cViewGrid() {
+}
+
+void cViewGrid::SetGrid(long gridID, double x, double y, double width, double height) {
+    if (!view)
+        return;
+    view->SetGrid(viewGridID, gridID, x, y, width, height, &intTokens, &stringTokens);
+}
+
+void cViewGrid::SetCurrent(long gridID, bool current) {
+    if (!view)
+        return;
+    view->SetGridCurrent(viewGridID, gridID, current);
+}
+
+void cViewGrid::MoveGrid(long gridID, double x, double y, double width, double height) {
+    if (!view)
+        return;
+    view->SetGrid(viewGridID, gridID, x, y, width, height, NULL, NULL);
+}
+
+void cViewGrid::Delete(long gridID) {
+    if (!view)
+        return;
+    view->DeleteGrid(viewGridID, gridID);
+}
+
+void cViewGrid::Clear(void) {
+    if (!view)
+        return;
+    view->ClearGrids(viewGridID);    
+}
+
+void cViewGrid::Display(void) {
+    if (!view)
+        return;
+    view->DisplayGrids(viewGridID);
+}
+
+/**********************************************************************
+* cViewTab
+**********************************************************************/
+cViewTab::cViewTab(cSkinDisplayPlugin *view) : cOsdElement(view) {
+}
+
+cViewTab::~cViewTab() {
+}
+
+void cViewTab::Init(void) {
+    view->SetTabIntTokens(&intTokens);
+    view->SetTabStringTokens(&stringTokens);
+    view->SetTabLoopTokens(&loopTokens);
+    view->SetTabs();    
+}
+
+void cViewTab::Left(void) {
+    view->TabLeft();
+}
+
+void cViewTab::Right(void) {
+    view->TabRight();
+}
+
+void cViewTab::Up(void) {
+    view->TabUp();
+}
+
+void cViewTab::Down(void) {
+    view->TabDown();
+}
+
+void cViewTab::Display(void) {
+    if (!view)
+        return;
+    view->DisplayTabs();
+}
+
+/**********************************************************************
+* cOsdView
+**********************************************************************/
+cOsdView::cOsdView(cSkinDisplayPlugin *displayPlugin) {
+    this->displayPlugin = displayPlugin;
+}
+
+cOsdView::~cOsdView() {
+    delete displayPlugin;
+}
+
+void cOsdView::Deactivate(bool hide) {
+    if (!displayPlugin)
+        return;
+    displayPlugin->Deactivate(hide);
+}
+
+void cOsdView::Activate(void) {
+    if (!displayPlugin)
+        return;
+    displayPlugin->Activate();
+}
+
+cViewElement *cOsdView::GetViewElement(int viewElementID) {
+    if (!displayPlugin)
+        return NULL;
+    return new cViewElement(displayPlugin, viewElementID);
+}
+
+cViewGrid *cOsdView::GetViewGrid(int viewGridID) {
+    if (!displayPlugin)
+        return NULL;
+    displayPlugin->InitGrids(viewGridID);
+    return new cViewGrid(displayPlugin, viewGridID);
+}
+
+cViewTab *cOsdView::GetViewTabs(void) {
+    if (!displayPlugin)
+        return NULL;
+    return new cViewTab(displayPlugin);
+}
+
+void cOsdView::Display(void) {
+    if (!displayPlugin)
+        return;
+    displayPlugin->Flush();   
+}
diff --git a/libskindesigner/osdelements.h b/libskindesigner/osdelements.h
new file mode 100644
index 0000000..057a1fd
--- /dev/null
+++ b/libskindesigner/osdelements.h
@@ -0,0 +1,91 @@
+#ifndef __OSDELEMENTS_H
+#define __OSDELEMENTS_H
+
+#include <vdr/plugin.h>
+#include "services.h"
+
+/**********************************************************************
+* cOsdElement
+**********************************************************************/
+
+class cOsdElement {
+protected:
+    cSkinDisplayPlugin *view;
+    map < string, string > stringTokens;
+    map < string, int > intTokens;
+    map < string, vector< map< string, string > > > loopTokens;
+public:
+    cOsdElement(cSkinDisplayPlugin *view);
+    virtual ~cOsdElement();
+    void AddLoopToken(string loopName, map<string, string> &tokens);
+    void AddStringToken(string key, string value);
+    void AddIntToken(string key, int value);
+    void ClearTokens(void);
+    bool ChannelLogoExists(string channelId);
+    string GetEpgImagePath(void);
+};
+
+/**********************************************************************
+* cViewElement
+**********************************************************************/
+class cViewElement : public cOsdElement {
+private:
+    int viewElementID;
+public:
+    cViewElement(cSkinDisplayPlugin *view, int viewElementID);
+    virtual ~cViewElement();
+    void Clear(void);
+    void Display(void);
+};
+
+/**********************************************************************
+* cViewGrid
+**********************************************************************/
+class cViewGrid : public cOsdElement {
+private:
+    int viewGridID;
+public:
+    cViewGrid(cSkinDisplayPlugin *view, int viewGridID);
+    virtual ~cViewGrid();
+    void SetGrid(long gridID, double x, double y, double width, double height);
+    void SetCurrent(long gridID, bool current);
+    void MoveGrid(long gridID, double x, double y, double width, double height);
+    void Delete(long gridID);
+    void Clear(void);
+    void Display(void);
+};
+
+/**********************************************************************
+* cViewTab
+**********************************************************************/
+class cViewTab : public cOsdElement {
+private:
+public:
+    cViewTab(cSkinDisplayPlugin *view);
+    virtual ~cViewTab();
+    void Init(void);
+    void Left(void);
+    void Right(void);
+    void Up(void);
+    void Down(void);
+    void Display(void);
+};
+
+/**********************************************************************
+* cOsdView
+**********************************************************************/
+class cOsdView {
+private:
+    cSkinDisplayPlugin *displayPlugin;
+public:
+    cOsdView(cSkinDisplayPlugin *displayPlugin);
+    virtual ~cOsdView();
+    void Deactivate(bool hide);
+    void Activate(void);
+    cViewElement *GetViewElement(int viewElementID);
+    cViewGrid *GetViewGrid(int viewGridID);
+    cViewTab *GetViewTabs(void);
+    void Display(void);
+};
+
+#endif // __OSDELEMENTS_H
\ No newline at end of file
diff --git a/libskindesigner/services.h b/libskindesigner/services.h
index 0a016fa..8fa9c69 100644
--- a/libskindesigner/services.h
+++ b/libskindesigner/services.h
@@ -20,6 +20,37 @@ public:
     virtual bool SetPluginText(map<string,string> *stringTokens, map<string,int> *intTokens, map<string,vector<map<string,string> > > *loopTokens);
 };
 
+class cSkinDisplayPlugin {
+public:
+    cSkinDisplayPlugin(void);
+    virtual ~cSkinDisplayPlugin(void);
+    virtual void Deactivate(bool hide);
+    virtual void Activate(void);
+    virtual void ClearViewElement(int id);
+    virtual void DisplayViewElement(int id);
+    virtual void SetViewElementIntTokens(map<string,int> *intTokens);
+    virtual void SetViewElementStringTokens(map<string,string> *stringTokens);
+    virtual void SetViewElementLoopTokens(map<string,vector<map<string,string> > > *loopTokens);
+    virtual void InitGrids(int viewGridID);
+    virtual void SetGrid(int viewGridID, long gridID, double x, double y, double width, double height, map<string,int> *intTokens, map<string,string> *stringTokens);
+    virtual void SetGridCurrent(int viewGridID, long gridID, bool current);
+    virtual void DeleteGrid(int viewGridID, long gridID);
+    virtual void DisplayGrids(int viewGridID);
+    virtual void ClearGrids(int viewGridID);
+    virtual void SetTabIntTokens(map<string,int> *intTokens);
+    virtual void SetTabStringTokens(map<string,string> *stringTokens);
+    virtual void SetTabLoopTokens(map<string,vector<map<string,string> > > *loopTokens);
+    virtual void SetTabs(void);
+    virtual void TabLeft(void);
+    virtual void TabRight(void);
+    virtual void TabUp(void);
+    virtual void TabDown(void);
+    virtual void DisplayTabs(void);
+    virtual void Flush(void);
+    virtual bool ChannelLogoExists(string channelId);
+    virtual string GetEpgImagePath(void);
+};
+
 /*********************************************************************
 * Data Structures for Service Calls
 *********************************************************************/
@@ -33,9 +64,40 @@ public:
     void SetMenu(int key, string templateName) {
         menus.insert(pair<int, string>(key, templateName));
     }
+    void SetView(int key, string templateName) {
+        views.insert(pair<int, string>(key, templateName));     
+    }
+    void SetSubView(int view, int subView, string templateName) {
+        pair<int, string> sub = make_pair(subView, templateName);
+        subViews.insert(pair<int, pair<int, string> >(view, sub));     
+    }
+    void SetViewElement(int view, int viewElement, string name) {
+        map< int, map<int, string> >::iterator hit = viewElements.find(view);
+        if (hit == viewElements.end()) {
+            map<int, string> vE;
+            vE.insert(pair<int, string >(viewElement, name));
+            viewElements.insert(pair<int, map < int, string > >(view, vE));
+        } else {
+            (hit->second).insert(pair<int, string >(viewElement, name));
+        }
+    }
+    void SetViewGrid(int view, int viewGrid, string name) {
+        map< int, map<int, string> >::iterator hit = viewGrids.find(view);
+        if (hit == viewGrids.end()) {
+            map<int, string> vG;
+            vG.insert(pair<int, string >(viewGrid, name));
+            viewGrids.insert(pair<int, map < int, string > >(view, vG));
+        } else {
+            (hit->second).insert(pair<int, string >(viewGrid, name));
+        }
+    }
 // in
-    string name;                 //name of plugin
-    map< int, string > menus;    //menus as key -> templatename hashmap 
+    string name;                                     //name of plugin
+    map< int, string > menus;                        //menus as key -> templatename hashmap 
+    map< int, string>  views;                        //standalone views as key -> templatename hashmap 
+    multimap< int, pair <int, string> >  subViews;   //subviews of standalone views as view -> (subview, templatename) multimap 
+    map< int, map <int, string> > viewElements;      //viewelements as key -> (viewelement, viewelementname) hashmap 
+    map< int, map <int, string> > viewGrids;         //viewgrids as key -> (viewgrid, viewgridname) hashmap
 //out
 };
 
@@ -46,7 +108,24 @@ public:
         displayMenu = NULL;
     };
 // in
-//out   
+//out	
     cSDDisplayMenu *displayMenu;
 };
-#endif //__SKINDESIGNERSERVICES_H
\ No newline at end of file
+
+// Data structure for service "GetDisplayPlugin"
+class GetDisplayPlugin {
+public:
+    GetDisplayPlugin(void) {
+        pluginName = "";
+        viewID = -1;
+        subViewID = -1;
+        displayPlugin = NULL;
+    };
+// in
+    string pluginName;
+    int viewID;
+    int subViewID;
+//out
+    cSkinDisplayPlugin *displayPlugin;
+};
+#endif //__SKINDESIGNERSERVICES_H
diff --git a/libskindesigner/skindesignerosdbase.c b/libskindesigner/skindesignerosdbase.c
index 821efdc..4d40615 100644
--- a/libskindesigner/skindesignerosdbase.c
+++ b/libskindesigner/skindesignerosdbase.c
@@ -1,4 +1,41 @@
 #include "skindesignerosdbase.h"
+#include "osdelements.h"
+
+/**********************************************************************
+* cSkindesignerOsdObject
+**********************************************************************/
+
+cSkindesignerOsdObject::cSkindesignerOsdObject(void) {
+    pSkinDesigner = NULL;
+    pluginName = "";
+}
+
+cSkindesignerOsdObject::~cSkindesignerOsdObject() {
+}
+
+bool cSkindesignerOsdObject::InitSkindesignerInterface(string pluginName) {
+    this->pluginName = pluginName;
+    pSkinDesigner = cPluginManager::GetPlugin("skindesigner");
+    if (!pSkinDesigner) {
+        return false;   
+    }
+    return true;
+}
+
+cOsdView *cSkindesignerOsdObject::GetOsdView(int viewID, int subViewID) {
+    cSkinDisplayPlugin *displayPlugin = NULL;
+    cOsdView *view = NULL;
+    GetDisplayPlugin call;
+    call.pluginName = pluginName;
+    call.viewID = viewID;
+    call.subViewID = subViewID;
+    bool ok = pSkinDesigner->Service("GetDisplayPlugin", &call);
+    if (ok) {
+        displayPlugin = call.displayPlugin;
+        view = new cOsdView(displayPlugin);
+    }
+    return view;
+}
 
 /**********************************************************************
 * cSkindesignerOsdItem
diff --git a/libskindesigner/skindesignerosdbase.h b/libskindesigner/skindesignerosdbase.h
index 88068af..060ec11 100644
--- a/libskindesigner/skindesignerosdbase.h
+++ b/libskindesigner/skindesignerosdbase.h
@@ -10,6 +10,26 @@
 #include <vdr/plugin.h>
 #include "services.h"
 
+class cOsdView;
+
+/**********************************************************************
+* cSkindesignerOsdObject
+**********************************************************************/
+class cSkindesignerOsdObject : public cOsdObject {
+protected:
+    string pluginName;
+    cPlugin *pSkinDesigner;
+    bool InitSkindesignerInterface(string pluginName);
+    cOsdView *GetOsdView(int viewID, int subViewID = -1);
+public:
+    cSkindesignerOsdObject(void);
+    virtual ~cSkindesignerOsdObject();
+    virtual void Show(void) {};
+};
+
+/**********************************************************************
+* cSkindesignerOsdItem
+**********************************************************************/
 class cSkindesignerOsdItem : public cOsdItem {
 private:
     cSDDisplayMenu *sdDisplayMenu;
@@ -28,7 +48,9 @@ public:
     void AddLoopToken(string loopName, map<string, string> &tokens);
 };
 
-
+/**********************************************************************
+* cSkindesignerOsdMenu
+**********************************************************************/
 class cSkindesignerOsdMenu : public cOsdMenu {
 private:
     bool init;
diff --git a/weatherforecast.c b/weatherforecast.c
index a3e1c3a..e2fee65 100644
--- a/weatherforecast.c
+++ b/weatherforecast.c
@@ -18,7 +18,7 @@
 //***************************************************************************
 // Constants
 //***************************************************************************
-static const char *VERSION        = "0.0.2";
+static const char *VERSION        = "0.0.3";
 static const char *DESCRIPTION    = "Weatherforecast based on forecast.io";
 static const char *MAINMENUENTRY  = tr("WeatherForecast");