summaryrefslogtreecommitdiff
path: root/views/displaymenuitemcurrentview.c
diff options
context:
space:
mode:
authorManuel Reimer <manuel.reimer@gmx.de>2014-11-02 13:41:30 +0100
committerManuel Reimer <manuel.reimer@gmx.de>2014-11-02 13:41:30 +0100
commitded6119b3b60eb2f36bbc1df8d6050c49f9e2a1f (patch)
tree11a1118233ebfe96cc034ba7e9914b379f85cfc1 /views/displaymenuitemcurrentview.c
parente07e56a3faced2f2ef7459cc13c2bda6f65f68ba (diff)
parentef4502cc02b4a1b287b6710826f04f953fd4691b (diff)
downloadvdr-plugin-skindesigner-ded6119b3b60eb2f36bbc1df8d6050c49f9e2a1f.tar.gz
vdr-plugin-skindesigner-ded6119b3b60eb2f36bbc1df8d6050c49f9e2a1f.tar.bz2
Merge branch 'master' of git://projects.vdr-developer.org/vdr-plugin-skindesigner
Diffstat (limited to 'views/displaymenuitemcurrentview.c')
-rw-r--r--views/displaymenuitemcurrentview.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/views/displaymenuitemcurrentview.c b/views/displaymenuitemcurrentview.c
index 312b041..741c7d1 100644
--- a/views/displaymenuitemcurrentview.c
+++ b/views/displaymenuitemcurrentview.c
@@ -165,7 +165,10 @@ void cDisplayMenuItemCurrentSchedulesView::Render(void) {
SetScraperPoster(event);
}
if (channel) {
- stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));
+ stringTokens.insert(pair<string,string>("channelname", channel->Name() ? channel->Name() : ""));
+ string channelID = *(channel->GetChannelID().ToString());
+ stringTokens.insert(pair<string,string>("channelid", channelID));
+ intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
}
vector< map<string,string> > schedulesTokens;
@@ -454,7 +457,7 @@ void cDisplayMenuItemCurrentTimerView::Render(void) {
SetScraperPoster(event);
} else {
stringTokens.insert(pair<string,string>("eventtitle", ""));
- stringTokens.insert(pair<string,string>("eventtitle", ""));
+ stringTokens.insert(pair<string,string>("eventstart", ""));
stringTokens.insert(pair<string,string>("eventstop", ""));
stringTokens.insert(pair<string,string>("eventshorttext", ""));
stringTokens.insert(pair<string,string>("eventdescription", ""));