frodovdr/vdr-plugin-skindesigner
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-skindesigner.git synced 2023-10-19 15:58:31 +00:00
Code Issues Releases Wiki Activity

added {channellogoexists} Token everywhere where {channelid} is available

Browse Source
This commit is contained in:
louis
2014-11-29 11:55:53 +01:00
parent 76ab3e4cef
commit af864fd449
10 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
views/displaymenudetailview.c
View File

@@ -127,7 +127,9 @@ void cDisplayMenuDetailView::SetTokens(void) {
intTokens.insert(pair<string, int>("daynumeric", sStartTime->tm_mday));
intTokens.insert(pair<string, int>("month", sStartTime->tm_mon+1));
stringTokens.insert(pair<string,string>("channelid", *(event->ChannelID().ToString())));
string channelID = *(event->ChannelID().ToString());
stringTokens.insert(pair<string,string>("channelid", channelID));
intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
bool isRunning = false;
time_t now = time(NULL);
@@ -658,7 +660,9 @@ void cDisplayMenuDetailView::DrawHeader(void) {
headerStringTokens.insert(pair<string,string>("channelname", ""));
headerIntTokens.insert(pair<string, int>("channelnumber", 0));
}
headerStringTokens.insert(pair<string,string>("channelid", *(event->ChannelID().ToString())));
string channelID = *(channel->GetChannelID().ToString());
headerStringTokens.insert(pair<string,string>("channelid", channelID));
headerIntTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
bool isRunning = false;
time_t now = time(NULL);

9
views/displaymenuitemcurrentview.c
View File

@@ -249,7 +249,9 @@ void cDisplayMenuItemCurrentChannelView::Render(void) {
intTokens.insert(pair<string,int>("frequency", channel->Frequency()));
stringTokens.insert(pair<string,string>("name", channel->Name() ? channel->Name() : ""));
stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));
string channelID = *(channel->GetChannelID().ToString());
stringTokens.insert(pair<string,string>("channelid", channelID));
intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
//Channel Source Information
const cSource *source = Sources.Get(channel->Source());
@@ -456,11 +458,14 @@ void cDisplayMenuItemCurrentTimerView::Render(void) {
const cChannel *channel = timer->Channel();
if (channel) {
stringTokens.insert(pair<string,string>("channelname", channel->Name() ? channel->Name() : ""));
stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));
string channelID = *(channel->GetChannelID().ToString());
stringTokens.insert(pair<string,string>("channelid", channelID));
intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
intTokens.insert(pair<string,int>("channelnumber", channel->Number()));
} else {
stringTokens.insert(pair<string,string>("channelname", ""));
stringTokens.insert(pair<string,string>("channelid", ""));
intTokens.insert(pair<string, int>("channellogoexists", 0));
intTokens.insert(pair<string,int>("channelnumber", 0));
}

9
views/displaymenuitemview.c
View File

@@ -416,7 +416,9 @@ void cDisplayMenuItemChannelsView::SetTokens(void) {
intTokens.insert(pair<string,int>("frequency", channel->Frequency()));
stringTokens.insert(pair<string,string>("name", channel->Name() ? channel->Name() : ""));
stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));
string channelID = *(channel->GetChannelID().ToString());
stringTokens.insert(pair<string,string>("channelid", channelID));
intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
//Channel Source Information
const cSource *source = Sources.Get(channel->Source());
@@ -560,11 +562,14 @@ void cDisplayMenuItemTimersView::SetTokens(void) {
const cChannel *channel = timer->Channel();
if (channel) {
stringTokens.insert(pair<string,string>("channelname", channel->Name() ? channel->Name() : ""));
stringTokens.insert(pair<string,string>("channelid", *(channel->GetChannelID().ToString())));
string channelID = *(channel->GetChannelID().ToString());
stringTokens.insert(pair<string,string>("channelid", channelID));
intTokens.insert(pair<string, int>("channellogoexists", imgCache->LogoExists(channelID)));
intTokens.insert(pair<string,int>("channelnumber", channel->Number()));
} else {
stringTokens.insert(pair<string,string>("channelname", ""));
stringTokens.insert(pair<string,string>("channelid", ""));
intTokens.insert(pair<string, int>("channellogoexists", 0));
intTokens.insert(pair<string,int>("channelnumber", 0));
}

5
views/viewhelpers.c
View File

@@ -133,12 +133,15 @@ bool cViewHelpers::SetDevices(bool initial, map<string,int> *intTokens, vector<m
strChanNum << channel->Number();
deviceVals.insert(pair< string, string >("devices[channelnumber]", strChanNum.str()));
deviceVals.insert(pair< string, string >("devices[channelname]", channel->Name()));
deviceVals.insert(pair< string, string >("devices[channelid]", *(channel->GetChannelID().ToString())));
string channelID = *(channel->GetChannelID().ToString());
deviceVals.insert(pair< string, string >("devices[channelid]", channelID));
deviceVals.insert(pair< string, string >("devices[channellogoexists]", imgCache->LogoExists(channelID) ? "1" : "0"));
deviceVals.insert(pair< string, string >("devices[istuned]", "1"));
} else {
deviceVals.insert(pair< string, string >("devices[channelnumber]", "0"));
deviceVals.insert(pair< string, string >("devices[channelname]", ""));
deviceVals.insert(pair< string, string >("devices[channelid]", ""));
deviceVals.insert(pair< string, string >("devices[channellogoexists]", "0"));
deviceVals.insert(pair< string, string >("devices[istuned]", "0"));
}