Separate out SPL/SPLEntry; start trying to make player read SPLs sensibly.

6 files changed, 285 insertions, 0 deletions

diff --git a/src/lib/content_store.h b/src/lib/content_store.h
new file mode 100644
index 000000000..028fa2797
--- /dev/null
+++ b/src/lib/content_store.h
@@ -0,0 +1,32 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <boost/shared_ptr.hpp>
+
+class Content;
+
+/** @class ContentStore
+ *  @brief Parent for classes which store content and can return content with a given digest.
+ */
+class ContentStore
+{
+public:
+	virtual boost::shared_ptr<Content> get (std::string digest) const = 0;
+};
diff --git a/src/lib/spl.cc b/src/lib/spl.cc
new file mode 100644
index 000000000..544706694
--- /dev/null
+++ b/src/lib/spl.cc
@@ -0,0 +1,58 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "spl.h"
+#include "content_store.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
+
+using boost::shared_ptr;
+
+bool
+SPL::read (boost::filesystem::path path, ContentStore* store)
+{
+	_spl.clear ();
+	cxml::Document doc ("SPL");
+	doc.read_file (path);
+	bool missing = false;
+	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));
+		} else {
+			missing = true;
+		}
+	}
+
+	_name = path.filename().string();
+	return missing;
+}
+
+void
+SPL::write (boost::filesystem::path path) const
+{
+	xmlpp::Document doc;
+	xmlpp::Element* root = doc.create_root_node ("SPL");
+	BOOST_FOREACH (SPLEntry i, _spl) {
+		i.as_xml (root->add_child("Entry"));
+	}
+	doc.write_to_file_formatted (path.string());
+}
diff --git a/src/lib/spl.h b/src/lib/spl.h
new file mode 100644
index 000000000..b93a93041
--- /dev/null
+++ b/src/lib/spl.h
@@ -0,0 +1,58 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "spl_entry.h"
+
+class ContentStore;
+
+class SPL
+{
+public:
+	void add (SPLEntry e) {
+		_spl.push_back (e);
+	}
+
+	void remove (std::size_t index) {
+		_spl.erase (_spl.begin() + index);
+	}
+
+	std::vector<SPLEntry> const & get () const {
+		return _spl;
+	}
+
+	SPLEntry & operator[] (std::size_t index) {
+		return _spl[index];
+	}
+
+	SPLEntry const & operator[] (std::size_t index) const {
+		return _spl[index];
+	}
+
+	bool read (boost::filesystem::path path, ContentStore* store);
+	void write (boost::filesystem::path path) const;
+
+	std::string name () const {
+		return _name;
+	}
+
+private:
+	std::string _name;
+	std::vector<SPLEntry> _spl;
+};
diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc
new file mode 100644
index 000000000..a2f36317e
--- /dev/null
+++ b/src/lib/spl_entry.cc
@@ -0,0 +1,72 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "spl_entry.h"
+#include "dcp_content.h"
+#include "dcpomatic_assert.h"
+#include <libxml++/libxml++.h>
+
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
+
+SPLEntry::SPLEntry (shared_ptr<Content> content)
+	: skippable (false)
+	, disable_timeline (false)
+	, stop_after_play (false)
+{
+	construct (content);
+}
+
+SPLEntry::SPLEntry (shared_ptr<Content> content, cxml::ConstNodePtr node)
+	: skippable (node->bool_child("Skippable"))
+	, disable_timeline (node->bool_child("DisableTimeline"))
+	, stop_after_play (node->bool_child("StopAfterPlay"))
+{
+	construct (content);
+}
+
+void
+SPLEntry::construct (shared_ptr<Content> c)
+{
+	content = c;
+	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (content);
+	digest = content->digest ();
+	if (dcp) {
+		name = dcp->name ();
+		DCPOMATIC_ASSERT (dcp->cpl());
+		id = *dcp->cpl();
+		kind = dcp->content_kind().get_value_or(dcp::FEATURE);
+		type = DCP;
+		encrypted = dcp->encrypted ();
+	} else {
+		name = content->path(0).filename().string();
+		type = ECINEMA;
+		kind = dcp::FEATURE;
+	}
+}
+
+void
+SPLEntry::as_xml (xmlpp::Element* e)
+{
+	e->add_child("Digest")->add_child_text(digest);
+	e->add_child("Skippable")->add_child_text(skippable ? "1" : "0");
+	e->add_child("DisableTimeline")->add_child_text(disable_timeline ? "1" : "0");
+	e->add_child("StopAfterPlay")->add_child_text(stop_after_play ? "1" : "0");
+}
diff --git a/src/lib/spl_entry.h b/src/lib/spl_entry.h
new file mode 100644
index 000000000..d939ec66a
--- /dev/null
+++ b/src/lib/spl_entry.h
@@ -0,0 +1,63 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef DCPOMATIC_SPL_ENTRY_H
+#define DCPOMATIC_SPL_ENTRY_H
+
+#include <libcxml/cxml.h>
+#include <dcp/types.h>
+#include <boost/shared_ptr.hpp>
+
+namespace xmlpp {
+	class Element;
+}
+
+class Content;
+
+class SPLEntry
+{
+public:
+	SPLEntry (boost::shared_ptr<Content> content);
+	SPLEntry (boost::shared_ptr<Content> content, cxml::ConstNodePtr node);
+
+	void as_xml (xmlpp::Element* e);
+
+	boost::shared_ptr<Content> content;
+	std::string name;
+	/** Digest of this content */
+	std::string digest;
+	/** CPL ID or something else for MP4 (?) */
+	std::string id;
+	dcp::ContentKind kind;
+	enum Type {
+		DCP,
+		ECINEMA
+	};
+	Type type;
+	bool encrypted;
+	bool skippable;
+	bool disable_timeline;
+	bool stop_after_play;
+
+private:
+	void construct (boost::shared_ptr<Content> content);
+};
+
+#endif
diff --git a/src/lib/wscript b/src/lib/wscript
index 7c332e88d..e2aeb7107 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -141,6 +141,8 @@ sources = """
           send_problem_report_job.cc
           server.cc
           shuffler.cc
+          spl.cc
+          spl_entry.cc
           string_log_entry.cc
           string_text_file.cc
           string_text_file_content.cc