Merge branch 'master' of git://projects.vdr-developer.org/vdr-plugin-skindesigner

4 files changed, 104 insertions, 2 deletions

diff --git a/views/displaychannelview.c b/views/displaychannelview.c
index 6187753..626658f 100644
--- a/views/displaychannelview.c
+++ b/views/displaychannelview.c
@@ -328,18 +328,44 @@ void cDisplayChannelView::DrawScraperContent(const cEvent *event) {
     if (pScraper->Service("GetPosterBanner", &call)) {
         int mediaWidth = 0;
         int mediaHeight = 0;
-        std::string mediaPath = "";
+        string mediaPath = "";
         bool isBanner = false;
+        int posterWidth = 0;
+        int posterHeight = 0;
+        string posterPath = "";
+        bool hasPoster = false;
+        int bannerWidth = 0;
+        int bannerHeight = 0;
+        string bannerPath = "";
+        bool hasBanner = false;
 
         if ((call.type == tSeries) && call.banner.path.size() > 0) {
             mediaWidth = call.banner.width;
             mediaHeight = call.banner.height;
             mediaPath = call.banner.path;
             isBanner = true;
+            bannerWidth = mediaWidth;
+            bannerHeight = mediaHeight;
+            bannerPath = mediaPath;
+            hasBanner = true;
+
+            ScraperGetPoster callPoster;
+            callPoster.event = event;
+            callPoster.recording = NULL;
+            if (pScraper->Service("GetPoster", &callPoster)) {
+                posterWidth = callPoster.poster.width;
+                posterHeight = callPoster.poster.height;
+                posterPath = callPoster.poster.path;
+                hasPoster = true;
+            }
         } else if (call.type == tMovie && call.poster.path.size() > 0 && call.poster.height > 0) {
             mediaWidth = call.poster.width;
             mediaHeight = call.poster.height;
             mediaPath = call.poster.path;
+            posterWidth = call.poster.width;
+            posterHeight = call.poster.height;
+            posterPath = call.poster.path;
+            hasPoster = true;
         } else
             return;
 
@@ -349,6 +375,14 @@ void cDisplayChannelView::DrawScraperContent(const cEvent *event) {
         intTokens.insert(pair<string,int>("mediaheight", mediaHeight));
         intTokens.insert(pair<string,int>("isbanner", isBanner));
         stringTokens.insert(pair<string,string>("mediapath", mediaPath));
+        intTokens.insert(pair<string,int>("posterwidth", posterWidth));
+        intTokens.insert(pair<string,int>("posterheight", posterHeight));
+        stringTokens.insert(pair<string,string>("posterpath", posterPath));
+        intTokens.insert(pair<string,int>("hasposter", hasPoster));
+        intTokens.insert(pair<string,int>("bannerwidth", bannerWidth));
+        intTokens.insert(pair<string,int>("bannerheight", bannerHeight));
+        stringTokens.insert(pair<string,string>("bannerpath", bannerPath));
+        intTokens.insert(pair<string,int>("hasbanner", hasBanner));
         ClearViewElement(veScraperContent);
         DrawViewElement(veScraperContent, &stringTokens, &intTokens);
     }
diff --git a/views/displaymenuitemcurrentview.c b/views/displaymenuitemcurrentview.c
index 741c7d1..4044b4f 100644
--- a/views/displaymenuitemcurrentview.c
+++ b/views/displaymenuitemcurrentview.c
@@ -433,8 +433,25 @@ void cDisplayMenuItemCurrentTimerView::Render(void) {
         strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);
         day = buffer;
     }
+
+    struct tm tm_r;
+    time_t timerDate = timer->Day();
+    localtime_r(&timerDate, &tm_r);
+    char buffer[4];
+    strftime(buffer, sizeof(buffer), "%m", &tm_r);
+    int month = atoi(buffer);
+    char buffer2[6];
+    strftime(buffer2, sizeof(buffer2), "%b", &tm_r);
+    string monthName = buffer2;
+    char buffer3[6];
+    strftime(buffer3, sizeof(buffer3), "%Y", &tm_r);
+    int year = atoi(buffer3);
+
     stringTokens.insert(pair<string,string>("day", day));
     stringTokens.insert(pair<string,string>("dayname", dayName));
+    intTokens.insert(pair<string,int>("month", month));
+    stringTokens.insert(pair<string,string>("monthname", monthName));
+    intTokens.insert(pair<string,int>("year", year));
 
     const cChannel *channel = timer->Channel();
     if (channel) {
diff --git a/views/displaymenuitemview.c b/views/displaymenuitemview.c
index 67fd641..0618363 100644
--- a/views/displaymenuitemview.c
+++ b/views/displaymenuitemview.c
@@ -537,8 +537,25 @@ void cDisplayMenuItemTimersView::SetTokens(void) {
         strftime(buffer, sizeof(buffer), "%Y%m%d", &tm_r);

         day = buffer;

     }

+    

+    struct tm tm_r;

+    time_t timerDate = timer->Day();

+    localtime_r(&timerDate, &tm_r);

+    char buffer[4];

+    strftime(buffer, sizeof(buffer), "%m", &tm_r);

+    int month = atoi(buffer);

+    char buffer2[6];

+    strftime(buffer2, sizeof(buffer2), "%b", &tm_r);

+    string monthName = buffer2;

+    char buffer3[6];

+    strftime(buffer3, sizeof(buffer3), "%Y", &tm_r);

+    int year = atoi(buffer3);

+

     stringTokens.insert(pair<string,string>("day", day));

     stringTokens.insert(pair<string,string>("dayname", dayName));

+    intTokens.insert(pair<string,int>("month", month));

+    stringTokens.insert(pair<string,string>("monthname", monthName));

+    intTokens.insert(pair<string,int>("year", year));

 

     const cChannel *channel = timer->Channel();

     if (channel) {

diff --git a/views/displayreplayview.c b/views/displayreplayview.c
index 7c72a90..5777590 100644
--- a/views/displayreplayview.c
+++ b/views/displayreplayview.c
@@ -141,18 +141,44 @@ void cDisplayReplayView::DrawScraperContent(const cRecording *recording) {
     if (pScraper->Service("GetPosterBannerV2", &call)) {
         int mediaWidth = 0;
         int mediaHeight = 0;
-        std::string mediaPath = "";
+        string mediaPath = "";
         bool isBanner = false;
+        int posterWidth = 0;
+        int posterHeight = 0;
+        string posterPath = "";
+        bool hasPoster = false;
+        int bannerWidth = 0;
+        int bannerHeight = 0;
+        string bannerPath = "";
+        bool hasBanner = false;
 
         if ((call.type == tSeries) && call.banner.path.size() > 0) {
             mediaWidth = call.banner.width;
             mediaHeight = call.banner.height;
             mediaPath = call.banner.path;
             isBanner = true;
+            bannerWidth = mediaWidth;
+            bannerHeight = mediaHeight;
+            bannerPath = mediaPath;
+            hasBanner = true;
+
+            ScraperGetPoster callPoster;
+            callPoster.event = NULL;
+            callPoster.recording = recording;
+            if (pScraper->Service("GetPoster", &callPoster)) {
+                posterWidth = callPoster.poster.width;
+                posterHeight = callPoster.poster.height;
+                posterPath = callPoster.poster.path;
+                hasPoster = true;
+            }
         } else if (call.type == tMovie && call.poster.path.size() > 0 && call.poster.height > 0) {
             mediaWidth = call.poster.width;
             mediaHeight = call.poster.height;
             mediaPath = call.poster.path;
+            posterWidth = call.poster.width;
+            posterHeight = call.poster.height;
+            posterPath = call.poster.path;
+            hasPoster = true;
         } else
             return;
 
@@ -162,6 +188,14 @@ void cDisplayReplayView::DrawScraperContent(const cRecording *recording) {
         intTokens.insert(pair<string,int>("mediaheight", mediaHeight));
         intTokens.insert(pair<string,int>("isbanner", isBanner));
         stringTokens.insert(pair<string,string>("mediapath", mediaPath));
+        intTokens.insert(pair<string,int>("posterwidth", posterWidth));
+        intTokens.insert(pair<string,int>("posterheight", posterHeight));
+        stringTokens.insert(pair<string,string>("posterpath", posterPath));
+        intTokens.insert(pair<string,int>("hasposter", hasPoster));
+        intTokens.insert(pair<string,int>("bannerwidth", bannerWidth));
+        intTokens.insert(pair<string,int>("bannerheight", bannerHeight));
+        stringTokens.insert(pair<string,string>("bannerpath", bannerPath));
+        intTokens.insert(pair<string,int>("hasbanner", hasBanner));
         ClearViewElement(veScraperContent);
         DrawViewElement(veScraperContent, &stringTokens, &intTokens);
     }