X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fspl.cc;h=8d0dcc6fc76df26b74e702adb1a8c14e8cf7f9d9;hp=7692df0cab1680d9800423c629eed32003e6e5db;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d diff --git a/src/lib/spl.cc b/src/lib/spl.cc index 7692df0ca..8d0dcc6fc 100644 --- a/src/lib/spl.cc +++ b/src/lib/spl.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2019 Carl Hetherington + Copyright (C) 2018-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "content_store.h" #include "spl.h" #include "warnings.h" @@ -26,14 +27,15 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_ENABLE_WARNINGS -#include #include + using std::cout; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using dcp::raw_convert; + void SPL::read (boost::filesystem::path path, ContentStore* store) { @@ -43,8 +45,8 @@ SPL::read (boost::filesystem::path path, ContentStore* store) doc.read_file (path); _id = doc.string_child("Id"); _name = doc.string_child("Name"); - BOOST_FOREACH (cxml::ConstNodePtr i, doc.node_children("Entry")) { - shared_ptr c = store->get(i->string_child("Digest")); + for (auto i: doc.node_children("Entry")) { + auto c = store->get(i->string_child("Digest")); if (c) { add (SPLEntry(c)); } else { @@ -53,14 +55,15 @@ SPL::read (boost::filesystem::path path, ContentStore* store) } } + void SPL::write (boost::filesystem::path path) const { xmlpp::Document doc; - xmlpp::Element* root = doc.create_root_node ("SPL"); + auto root = doc.create_root_node ("SPL"); root->add_child("Id")->add_child_text (_id); root->add_child("Name")->add_child_text (_name); - BOOST_FOREACH (SPLEntry i, _spl) { + for (auto i: _spl) { i.as_xml (root->add_child("Entry")); } doc.write_to_file_formatted (path.string());