diff options
| -rw-r--r-- | skins/metrixhd/xmlfiles/displaymenuschedules.xml | 4 | ||||
| -rw-r--r-- | skins/nopacity/xmlfiles/displaymenuschedules.xml | 4 | ||||
| -rw-r--r-- | skinskeleton/xmlfiles/displaymenuschedules.xml | 4 | ||||
| -rw-r--r-- | views/displaymenuitemview.c | 5 |
4 files changed, 14 insertions, 3 deletions
diff --git a/skins/metrixhd/xmlfiles/displaymenuschedules.xml b/skins/metrixhd/xmlfiles/displaymenuschedules.xml index eb856c8..5cc2e76 100644 --- a/skins/metrixhd/xmlfiles/displaymenuschedules.xml +++ b/skins/metrixhd/xmlfiles/displaymenuschedules.xml @@ -31,12 +31,14 @@ {duration} duration of event {current} true if item is currently selected {separator} true if item is a list separator - {channelid} ChannelID as path to display channel logo + {channelname} Channel Name (for what's on now and next) + {channelid} ChannelID as path to display channel logo (for what's on now and next) {whatson} true if menu "What's on" is displayed {whatsonnow} true if menu "What's on now" is displayed {whatsonnext} true if menu "What's on next" is displayed {timerpartitial} true if partitial timer is set for the event {timerfull} true if full timer is set for the event + {hasVPS} true if event has VPS information --> <listelement> <!-- Background --> diff --git a/skins/nopacity/xmlfiles/displaymenuschedules.xml b/skins/nopacity/xmlfiles/displaymenuschedules.xml index 8e9708f..eae8e9d 100644 --- a/skins/nopacity/xmlfiles/displaymenuschedules.xml +++ b/skins/nopacity/xmlfiles/displaymenuschedules.xml @@ -40,12 +40,14 @@ {duration} duration of event {current} true if item is currently selected {separator} true if item is a list separator - {channelid} ChannelID as path to display channel logo + {channelname} Channel Name (for what's on now and next) + {channelid} ChannelID as path to display channel logo (for what's on now and next) {whatson} true if menu "What's on" is displayed {whatsonnow} true if menu "What's on now" is displayed {whatsonnext} true if menu "What's on next" is displayed {timerpartitial} true if partitial timer is set for the event {timerfull} true if full timer is set for the event + {hasVPS} true if event has VPS information --> <listelement> <!-- background and foreground--> diff --git a/skinskeleton/xmlfiles/displaymenuschedules.xml b/skinskeleton/xmlfiles/displaymenuschedules.xml index 3c615c9..0144bfd 100644 --- a/skinskeleton/xmlfiles/displaymenuschedules.xml +++ b/skinskeleton/xmlfiles/displaymenuschedules.xml @@ -26,12 +26,14 @@ {duration} duration of event {current} true if item is currently selected {separator} true if item is a list separator - {channelid} ChannelID as path to display channel logo + {channelname} Channel Name (for what's on now and next) + {channelid} ChannelID as path to display channel logo (for what's on now and next) {whatson} true if menu "What's on" is displayed {whatsonnow} true if menu "What's on now" is displayed {whatsonnext} true if menu "What's on next" is displayed {timerpartitial} true if partitial timer is set for the event {timerfull} true if full timer is set for the event + {hasVPS} true if event has VPS information --> <listelement> </listelement> diff --git a/views/displaymenuitemview.c b/views/displaymenuitemview.c index b103cf3..58473df 100644 --- a/views/displaymenuitemview.c +++ b/views/displaymenuitemview.c @@ -314,15 +314,20 @@ void cDisplayMenuItemSchedulesView::SetTokens(void) { intTokens.insert(pair<string,int>("elapsed", 0));
}
intTokens.insert(pair<string,int>("duration", event->Duration() / 60));
+ intTokens.insert(pair<string,int>("hasVPS", (bool)event->Vps()));
} else {
stringTokens.insert(pair<string,string>("title", event->Title() ? ParseSeparator(event->Title()) : ""));
}
}
if (channel) {
+ stringTokens.insert(pair<string,string>("channelname", channel->Name() ? channel->Name() : ""));
stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));
if (!event && !selectable) {
stringTokens.insert(pair<string,string>("title", channel->Name() ? ParseSeparator(channel->Name()) : ""));
}
+ } else {
+ stringTokens.insert(pair<string,string>("channelname", ""));
+ stringTokens.insert(pair<string,string>("channelid", ""));
}
}
|