From 3280b839d1d598d514d8d325c45bf789c0a220c1 Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 6 Dec 2014 10:26:38 +0100 Subject: [PATCH] added channelnumber token to displaymenuschedules --- skins/metrixhd/xmlfiles/displaymenuschedules.xml | 2 ++ skinskeleton/xmlfiles/displaymenuschedules.xml | 2 ++ views/displaymenuitemcurrentview.c | 1 + views/displaymenuitemview.c | 2 ++ 4 files changed, 7 insertions(+) diff --git a/skins/metrixhd/xmlfiles/displaymenuschedules.xml b/skins/metrixhd/xmlfiles/displaymenuschedules.xml index 08c6070..75a29dc 100644 --- a/skins/metrixhd/xmlfiles/displaymenuschedules.xml +++ b/skins/metrixhd/xmlfiles/displaymenuschedules.xml @@ -41,6 +41,7 @@ {current} true if item is currently selected {separator} true if item is a list separator {channelname} Channel Name + {channelnumber} Channel Number {channelid} ChannelID as path to display channel logo {channellogoexists} true if a channel logo exists {whatson} true if menu "What's on" is displayed @@ -126,6 +127,7 @@ {durationhours} duration, full hours {durationminutes} duration, rest of minutes {channelname} Channel Name + {channelnumber} Channel Number {channelid} ChannelID as path to display channel logo {channellogoexists} true if a channel logo exists {hasposter} true if a scraped poster is available for this element diff --git a/skinskeleton/xmlfiles/displaymenuschedules.xml b/skinskeleton/xmlfiles/displaymenuschedules.xml index 4b6b20d..ad4c7ae 100644 --- a/skinskeleton/xmlfiles/displaymenuschedules.xml +++ b/skinskeleton/xmlfiles/displaymenuschedules.xml @@ -35,6 +35,7 @@ {current} true if item is currently selected {separator} true if item is a list separator {channelname} Channel Name + {channelnumber} Channel Number {channelid} ChannelID as path to display channel logo {channellogoexists} true if a channel logo exists {whatson} true if menu "What's on" is displayed @@ -67,6 +68,7 @@ {durationhours} duration, full hours {durationminutes} duration, rest of minutes {channelname} Channel Name + {channelnumber} Channel Number {channelid} ChannelID as path to display channel logo {channellogoexists} true if a channel logo exists {hasposter} true if a scraped poster is available for this element diff --git a/views/displaymenuitemcurrentview.c b/views/displaymenuitemcurrentview.c index 58a6118..de84e8b 100644 --- a/views/displaymenuitemcurrentview.c +++ b/views/displaymenuitemcurrentview.c @@ -168,6 +168,7 @@ void cDisplayMenuItemCurrentSchedulesView::Render(void) { stringTokens.insert(pair("channelname", channel->Name() ? channel->Name() : "")); string channelID = *(channel->GetChannelID().ToString()); stringTokens.insert(pair("channelid", channelID)); + intTokens.insert(pair("channelnumber", channel->Number())); intTokens.insert(pair("channellogoexists", imgCache->LogoExists(channelID))); } diff --git a/views/displaymenuitemview.c b/views/displaymenuitemview.c index 12eeddc..d6b43a4 100644 --- a/views/displaymenuitemview.c +++ b/views/displaymenuitemview.c @@ -335,6 +335,7 @@ void cDisplayMenuItemSchedulesView::SetTokens(void) { stringTokens.insert(pair("channelname", channel->Name() ? channel->Name() : "")); string channelID = *(channel->GetChannelID().ToString()); stringTokens.insert(pair("channelid", channelID)); + intTokens.insert(pair("channelnumber", channel->Number())); intTokens.insert(pair("channellogoexists", imgCache->LogoExists(channelID))); if (!event && !selectable) { stringTokens.insert(pair("title", channel->Name() ? ParseSeparator(channel->Name()) : "")); @@ -342,6 +343,7 @@ void cDisplayMenuItemSchedulesView::SetTokens(void) { } else { stringTokens.insert(pair("channelname", "")); stringTokens.insert(pair("channelid", "")); + intTokens.insert(pair("channelnumber", 0)); intTokens.insert(pair("channellogoexists", 0)); } }