diff options
| author | louis <louis.braun@gmx.de> | 2015-04-10 16:44:29 +0200 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2015-04-10 16:44:29 +0200 |
| commit | 5146f15e44d9523e3dc96bf0f5e0aeaf1bee9c2f (patch) | |
| tree | 553ab422e102a9096f637a91114d48cf8846bd2e /libtemplate | |
| parent | 97f3d372dc6cdd81f3f298f37c6a542adc6aa959 (diff) | |
| download | vdr-plugin-skindesigner-5146f15e44d9523e3dc96bf0f5e0aeaf1bee9c2f.tar.gz vdr-plugin-skindesigner-5146f15e44d9523e3dc96bf0f5e0aeaf1bee9c2f.tar.bz2 | |
fixed bug that string tokens are not evaluated in area conditions
Diffstat (limited to 'libtemplate')
| -rw-r--r-- | libtemplate/templatepixmap.c | 4 | ||||
| -rw-r--r-- | libtemplate/templatepixmap.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libtemplate/templatepixmap.c b/libtemplate/templatepixmap.c index 7379633..473561a 100644 --- a/libtemplate/templatepixmap.c +++ b/libtemplate/templatepixmap.c @@ -80,11 +80,13 @@ void cTemplatePixmap::ClearDynamicParameters(void) { parameters->ClearDynamicParameters();
}
-void cTemplatePixmap::ParseDynamicParameters(map <string,int> *intTokens, bool initFuncs) {
+void cTemplatePixmap::ParseDynamicParameters(map <string,string> *stringTokens, map <string,int> *intTokens, bool initFuncs) {
parameters->ClearDynamicParameters();
parameters->SetIntTokens(intTokens);
+ parameters->SetStringTokens(stringTokens);
parameters->ParseParameters();
parameters->UnsetIntTokens();
+ parameters->UnsetStringTokens();
if (!DoExecute()) {
parameters->ClearDynamicParameters();
diff --git a/libtemplate/templatepixmap.h b/libtemplate/templatepixmap.h index 3be1816..fd2d3ce 100644 --- a/libtemplate/templatepixmap.h +++ b/libtemplate/templatepixmap.h @@ -63,7 +63,7 @@ public: //Clear dynamically set pixmap parameters void ClearDynamicParameters(void); //Parse pixmap parameters with dynamically set Tokens - void ParseDynamicParameters(map <string,int> *intTokens, bool initFuncs); + void ParseDynamicParameters(map <string,string> *stringTokens, map <string,int> *intTokens, bool initFuncs); //Parse all function parameters with dynamically set Tokens void ParseDynamicFunctionParameters(map <string,string> *stringTokens, map <string,int> *intTokens); //Calculate size of drawport in case area scrolls |