diff options
Diffstat (limited to 'xml')
| -rw-r--r-- | xml/function.c | 7 | ||||
| -rw-r--r-- | xml/parser.c | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/xml/function.c b/xml/function.c index e6e321c..f283c2c 100644 --- a/xml/function.c +++ b/xml/function.c @@ -4,6 +4,7 @@ #include "xml/function.h" #include "render.h" +#include "bitmap.h" #include "common.h" #include <vdr/tools.h> @@ -156,10 +157,8 @@ bool cxFunction::Parse(const std::string &Text) const std::string &cxFunction::FunFile(const std::string &Param) const { std::string path = cText2SkinRender::ImagePath(Param); - Dprintf("checking file(%s)\n", path.c_str()); - if (access(path.c_str(), F_OK) == 0) - return Param; - return False; + Dprintf("checking file(%s) in cache\n", path.c_str()); + return cText2SkinBitmap::Load(path) ? Param : False; } std::string cxFunction::Evaluate(void) const diff --git a/xml/parser.c b/xml/parser.c index 1349769..4b957be 100644 --- a/xml/parser.c +++ b/xml/parser.c @@ -205,6 +205,9 @@ bool xStartElem(const std::string &name, std::map<std::string,std::string> &attr || name == "scrollbar") { ATTRIB_OPT_STRING("color", object->mFg); ATTRIB_OPT_STRING("bgColor", object->mBg); + ATTRIB_OPT_STRING("mark", object->mMark); + ATTRIB_OPT_STRING("active", object->mActive); + ATTRIB_OPT_STRING("keep", object->mKeep); ATTRIB_OPT_FUNC ("current", object->mCurrent.Parse); ATTRIB_OPT_FUNC ("total", object->mTotal.Parse); } |