X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fspl.h;h=b002a08829bdeadaa1be72a00b33bbcca1d0c6d4;hp=308f5286db9a267c8bd9c14c9edb654a97953442;hb=704e1112538d809fd55bd7f25385eaa5d064966c;hpb=d3f97ca7ca2877689f4ed59482e935431d43f027

diff --git a/src/lib/spl.h b/src/lib/spl.h
index 308f5286d..b002a0882 100644
--- a/src/lib/spl.h
+++ b/src/lib/spl.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,14 +18,20 @@
 
 */
 
+
 #ifndef DCPOMATIC_SPL_H
 #define DCPOMATIC_SPL_H
 
-#include "swaroop_spl_entry.h"
+
+#include "spl_entry.h"
 #include <dcp/util.h>
+#include <boost/signals2.hpp>
+#include <algorithm>
+
 
 class ContentStore;
 
+
 class SPL
 {
 public:
@@ -34,6 +40,13 @@ public:
 		, _missing (false)
 	{}
 
+	SPL (std::string name)
+		: _id (dcp::make_uuid())
+		, _name (name)
+		, _missing (false)
+	{}
+
+
 	void add (SPLEntry e) {
 		_spl.push_back (e);
 	}
@@ -46,12 +59,12 @@ public:
 		return _spl;
 	}
 
-	SPLEntry & operator[] (std::size_t index) {
+	SPLEntry const & operator[] (std::size_t index) const {
 		return _spl[index];
 	}
 
-	SPLEntry const & operator[] (std::size_t index) const {
-		return _spl[index];
+	void swap(size_t a, size_t b) {
+		std::iter_swap(_spl.begin() + a, _spl.begin() + b);
 	}
 
 	void read (boost::filesystem::path path, ContentStore* store);
@@ -61,52 +74,47 @@ public:
 		return _id;
 	}
 
-	boost::optional<boost::filesystem::path> path () const {
-		return _path;
+	std::string name () const {
+		return _name;
 	}
 
-	std::string name () const {
-		if (!_path) {
-			return "";
-		}
-		return _path->filename().string();
+	void set_name (std::string name) {
+		_name = name;
 	}
 
 	bool missing () const {
 		return _missing;
 	}
 
-	boost::optional<int> allowed_shows () const {
-		return _allowed_shows;
-	}
+private:
+	std::string _id;
+	std::string _name;
+	std::vector<SPLEntry> _spl;
+	/** true if any content was missing when read() was last called on this SPL */
+	bool _missing;
+};
 
-	bool have_allowed_shows () const {
-		return !_allowed_shows || *_allowed_shows > 0;
-	}
 
-	void set_allowed_shows (int s) {
-		_allowed_shows = s;
-	}
+class SignalSPL : public SPL
+{
+public:
+	enum class Change {
+		NAME,
+		CONTENT,
+	};
 
-	void unset_allowed_shows () {
-		_allowed_shows = boost::optional<int>();
-	}
+	SignalSPL () {}
 
-	void decrement_allowed_shows () {
-		if (_allowed_shows) {
-			(*_allowed_shows)--;
-		}
+	SignalSPL (std::string name)
+		: SPL (name)
+	{}
 
+	void set_name (std::string name) {
+		SPL::set_name (name);
+		Changed(Change::NAME);
 	}
 
-private:
-	std::string _id;
-	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;
+	boost::signals2::signal<void (Change)> Changed;
 };
 
 #endif