swaroop: allowed-shows state in playlist.

2 files changed, 46 insertions, 4 deletions

diff --git a/src/lib/spl.cc b/src/lib/spl.cc
index cd33c4047..e8e86f89c 100644
--- a/src/lib/spl.cc
+++ b/src/lib/spl.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,16 +21,21 @@
 #include "spl.h"
 #include "content_store.h"
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <iostream>
 
 using std::cout;
+using std::string;
 using boost::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");
@@ -45,17 +50,22 @@ SPL::read (boost::filesystem::path path, ContentStore* store)
 		}
 	}
 
-	_name = path.filename().string();
+	_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);
 	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());
 }
diff --git a/src/lib/spl.h b/src/lib/spl.h
index b19ef7e7a..18892993f 100644
--- a/src/lib/spl.h
+++ b/src/lib/spl.h
@@ -61,20 +61,52 @@ public:
 		return _id;
 	}
 
+	boost::optional<boost::filesystem::path> path () const {
+		return _path;
+	}
+
 	std::string name () const {
-		return _name;
+		if (!_path) {
+			return "";
+		}
+		return _path->filename().string();
 	}
 
 	bool missing () const {
 		return _missing;
 	}
 
+	boost::optional<int> allowed_shows () const {
+		return _allowed_shows;
+	}
+
+	bool have_allowed_shows () const {
+		return !_allowed_shows || *_allowed_shows > 0;
+	}
+
+	void set_allowed_shows (int s) {
+		_allowed_shows = s;
+	}
+
+	void unset_allowed_shows () {
+		_allowed_shows = boost::optional<int>();
+	}
+
+	void decrement_allowed_shows () {
+		if (_allowed_shows) {
+			(*_allowed_shows)--;
+		}
+
+	}
+
 private:
 	std::string _id;
-	std::string _name;
+	mutable boost::optional<boost::filesystem::path> _path;
 	std::vector<SPLEntry> _spl;
 	/** true if any content was missing when read() was last called on this SPL */
 	bool _missing;
+	/** number of times left that the player will allow this playlist to be played (unset means infinite shows) */
+	boost::optional<int> _allowed_shows;
 };
 
 #endif