diff options
author | enen92 <92enen@gmail.com> | 2023-12-05 10:39:25 +0000 |
---|---|---|
committer | enen92 <92enen@gmail.com> | 2023-12-05 10:39:25 +0000 |
commit | e48bcb21a949813c20c6922671cf71b45b996ed1 (patch) | |
tree | f484f501dcabc9fd490e8a27f75d2433b43f5548 | |
parent | 0c8ba59977a94b3c4aa325bb37a113ac5eaa98db (diff) |
[EDL] Migrate to tinyxml2
-rw-r--r-- | xbmc/cores/VideoPlayer/Edl.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xbmc/cores/VideoPlayer/Edl.cpp b/xbmc/cores/VideoPlayer/Edl.cpp index a3bbea05ad..83f24a4e77 100644 --- a/xbmc/cores/VideoPlayer/Edl.cpp +++ b/xbmc/cores/VideoPlayer/Edl.cpp @@ -17,7 +17,7 @@ #include "settings/SettingsComponent.h" #include "utils/StringUtils.h" #include "utils/URIUtils.h" -#include "utils/XBMCTinyXML.h" +#include "utils/XBMCTinyXML2.h" #include "utils/log.h" #include "PlatformDefs.h" @@ -482,22 +482,22 @@ bool CEdl::ReadBeyondTV(const std::string& strMovie) if (!CFile::Exists(beyondTVFilename)) return false; - CXBMCTinyXML xmlDoc; + CXBMCTinyXML2 xmlDoc; if (!xmlDoc.LoadFile(beyondTVFilename)) { CLog::Log(LOGERROR, "{} - Could not load Beyond TV file: {}. {}", __FUNCTION__, - CURL::GetRedacted(beyondTVFilename), xmlDoc.ErrorDesc()); + CURL::GetRedacted(beyondTVFilename), xmlDoc.ErrorStr()); return false; } if (xmlDoc.Error()) { CLog::Log(LOGERROR, "{} - Could not parse Beyond TV file: {}. {}", __FUNCTION__, - CURL::GetRedacted(beyondTVFilename), xmlDoc.ErrorDesc()); + CURL::GetRedacted(beyondTVFilename), xmlDoc.ErrorStr()); return false; } - TiXmlElement *pRoot = xmlDoc.RootElement(); + const tinyxml2::XMLElement* pRoot = xmlDoc.RootElement(); if (!pRoot || strcmp(pRoot->Value(), "cutlist")) { CLog::Log(LOGERROR, "{} - Invalid Beyond TV file: {}. Expected root node to be <cutlist>", @@ -506,11 +506,11 @@ bool CEdl::ReadBeyondTV(const std::string& strMovie) } bool bValid = true; - TiXmlElement *pRegion = pRoot->FirstChildElement("Region"); + const tinyxml2::XMLElement* pRegion = pRoot->FirstChildElement("Region"); while (bValid && pRegion) { - TiXmlElement *pStart = pRegion->FirstChildElement("start"); - TiXmlElement *pEnd = pRegion->FirstChildElement("end"); + const tinyxml2::XMLElement* pStart = pRegion->FirstChildElement("start"); + const tinyxml2::XMLElement* pEnd = pRegion->FirstChildElement("end"); if (pStart && pEnd && pStart->FirstChild() && pEnd->FirstChild()) { /* |