diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | xml-base.c | 2 | ||||
| -rw-r--r-- | xml-base.h | 12 | ||||
| -rw-r--r-- | xml-cache.c | 11 |
4 files changed, 12 insertions, 15 deletions
@@ -49,7 +49,7 @@ SOFILE = libvdr-$(PLUGIN).so INCLUDES += $(shell taglib-config --cflags) -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTIXML_USE_STL +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D__STDC_CONSTANT_MACROS -DTIXML_USE_STL LIBS = $(shell taglib-config --libs) -ltinyxml @@ -8,9 +8,7 @@ #include <unistd.h> - using namespace std; -using namespace a_land; /* --- cXmlBase ------------------------------------------------------------- */ @@ -5,7 +5,7 @@ #ifndef __XML_BASE_H #define __XML_BASE_H -#include "tinyxml/tinyxml.h" +#include <tinyxml.h> #include <string> @@ -14,8 +14,8 @@ class cXmlBase { private: std::string path, root_element; - a_land::TiXmlDocument *document; - a_land::TiXmlElement *root; + TiXmlDocument *document; + TiXmlElement *root; protected: virtual ~cXmlBase(); @@ -26,11 +26,11 @@ public: bool load(const std::string &_path); void clear(void); - void add_subelement(a_land::TiXmlElement &main_element, + void add_subelement(TiXmlElement &main_element, const char *name, const std::string &text); - a_land::TiXmlDocument *get_document(void) { return document; } - a_land::TiXmlElement *get_root(void) { return root; } + TiXmlDocument *get_document(void) { return document; } + TiXmlElement *get_root(void) { return root; } void set_root(void); }; diff --git a/xml-cache.c b/xml-cache.c index 14204b9..556a5df 100644 --- a/xml-cache.c +++ b/xml-cache.c @@ -19,7 +19,6 @@ using namespace std; -using namespace a_land; /* --- cXmlCache ------------------------------------------------------------ */ @@ -111,7 +110,7 @@ void cXmlCache::add_track(const cTrackInfo &trackinfo, bool save) trackinfo.get_title().empty()) return; - a_land::TiXmlElement track("track"); + TiXmlElement track("track"); track.SetAttribute("path", trackinfo.get_partial_path()); track.SetAttribute("date", trackinfo.get_date()); track.SetAttribute("time", trackinfo.get_time()); @@ -146,7 +145,7 @@ void cXmlCache::add_track(const cTrackInfo &trackinfo, bool save) void cXmlCache::copy_to_objects(void) { - a_land::TiXmlElement *xml_track = get_root()->FirstChildElement("track"); + TiXmlElement *xml_track = get_root()->FirstChildElement("track"); while (xml_track) { cTrackInfo trackinfo; @@ -155,7 +154,7 @@ void cXmlCache::copy_to_objects(void) if (path.empty()) { /* remove deleted files from the xml-cache */ - a_land::TiXmlElement *tmp = xml_track; + TiXmlElement *tmp = xml_track; xml_track = xml_track->NextSiblingElement("track"); get_root()->RemoveChild(tmp); @@ -169,7 +168,7 @@ void cXmlCache::copy_to_objects(void) if (access(path.c_str(), F_OK) == -1) { dsyslog("[audiorecorder]: copy %s : (%s, %s())", path.c_str(), __FILE__, __func__); /* remove deleted files from the xml-cache */ - a_land::TiXmlElement *tmp = xml_track; + TiXmlElement *tmp = xml_track; xml_track = xml_track->NextSiblingElement("track"); get_root()->RemoveChild(tmp); @@ -181,7 +180,7 @@ void cXmlCache::copy_to_objects(void) if (xml_track->Attribute("time")) trackinfo.set_time(xml_track->Attribute("time")); - for (a_land::TiXmlElement *element = xml_track->FirstChildElement(); + for (TiXmlElement *element = xml_track->FirstChildElement(); element; element = element->NextSiblingElement()) { if (element->FirstChild() == NULL) continue; |