X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fspl.cc;h=8d0dcc6fc76df26b74e702adb1a8c14e8cf7f9d9;hb=4417fa5d535d870999672c94541fe03837e986f4;hp=02ed966a4eac36ee2f3aeb9cae106944fcff9a67;hpb=d3f97ca7ca2877689f4ed59482e935431d43f027;p=dcpomatic.git

diff --git a/src/lib/spl.cc b/src/lib/spl.cc
index 02ed966a4..8d0dcc6fc 100644
--- a/src/lib/spl.cc
+++ b/src/lib/spl.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,54 +18,53 @@
 
 */
 
-#include "swaroop_spl.h"
+
 #include "content_store.h"
+#include "spl.h"
+#include "warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
+
 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)
 {
-	_path = path;
-
 	_spl.clear ();
 	_missing = false;
 	cxml::Document doc ("SPL");
 	doc.read_file (path);
 	_id = doc.string_child("Id");
-	BOOST_FOREACH (cxml::ConstNodePtr i, doc.node_children("Entry")) {
-		shared_ptr<Content> c = store->get(i->string_child("Digest"));
+	_name = doc.string_child("Name");
+	for (auto i: doc.node_children("Entry")) {
+		auto c = store->get(i->string_child("Digest"));
 		if (c) {
-			add (SPLEntry(c, i));
+			add (SPLEntry(c));
 		} else {
 			_missing = true;
 		}
 	}
-
-	_allowed_shows = doc.optional_number_child<int>("AllowedShows");
 }
 
+
 void
 SPL::write (boost::filesystem::path path) const
 {
-	_path = path;
-
 	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);
-	BOOST_FOREACH (SPLEntry i, _spl) {
+	root->add_child("Name")->add_child_text (_name);
+	for (auto i: _spl) {
 		i.as_xml (root->add_child("Entry"));
 	}
-	if (_allowed_shows) {
-		root->add_child("AllowedShows")->add_child_text(raw_convert<string>(*_allowed_shows));
-	}
 	doc.write_to_file_formatted (path.string());
 }