X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fspl.cc;h=ccf809f8bc5523f2e98dd81f4b9a84bfe40cb157;hp=e8e86f89ce227b401c4ade2210e176bdd45dec1d;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=25b1934f24206b6dda5ce5a7686930d605ff6ccc

diff --git a/src/lib/spl.cc b/src/lib/spl.cc
index e8e86f89c..ccf809f8b 100644
--- a/src/lib/spl.cc
+++ b/src/lib/spl.cc
@@ -34,38 +34,31 @@ 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");
+	_name = doc.string_child("Name");
 	BOOST_FOREACH (cxml::ConstNodePtr i, doc.node_children("Entry")) {
 		shared_ptr<Content> 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");
 	root->add_child("Id")->add_child_text (_id);
+	root->add_child("Name")->add_child_text (_name);
 	BOOST_FOREACH (SPLEntry 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());
 }