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

support for global variables type 'double'

Browse Source
This commit is contained in:
louis
2014-10-10 15:32:38 +02:00
parent ebe8ac563b
commit 7fbcc9d330
6 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libtemplate/globals.h
View File

@@ -27,6 +27,7 @@ public:
virtual ~cGlobals(void) {};
map <string, tColor> colors;
map <string, int> intVars;
map <string, double> doubleVars;
map <string, string> stringVars;
map <string, string> fonts;
map <string, map< string, string > > translations;

11
libtemplate/parameter.c
View File

@@ -156,6 +156,17 @@ bool cNumericParameter::CheckExpression(int &val, string &parsedVal) {
parsedValue = parsedValue.replace(foundToken, token.size(), st.str());
}
}
for (map<string, double>::iterator globDouble = globals->doubleVars.begin(); globDouble != globals->doubleVars.end(); globDouble++) {
stringstream sToken;
sToken << "{" << globDouble->first << "}";
string token = sToken.str();
size_t foundToken = parsedValue.find(token);
if (foundToken != string::npos) {
stringstream st;
st << globDouble->second;
parsedValue = parsedValue.replace(foundToken, token.size(), st.str());
}
}
}
if (IsNumber(parsedValue)) {

3
libtemplate/xmlparser.c
View File

@@ -291,6 +291,9 @@ void cXmlParser::InsertVariable(string name, string type, string value) {
if (!type.compare("int")) {
int val = atoi(value.c_str());
globals->intVars.insert(pair<string, int>(name, val));
} else if (!type.compare("double")) {
double val = atof(value.c_str());
globals->doubleVars.insert(pair<string, double>(name, val));
} else if (!type.compare("string")) {
globals->stringVars.insert(pair<string, string>(name, value));
}