Various KDM and encryption fixes.

1 files changed, 45 insertions, 2 deletions

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 6f426ae8d..251bb5d61 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -1,5 +1,31 @@
+/*
+    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+
+    This program 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.
+
+    This program 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 this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/enable_shared_from_this.hpp>
 #include <libdcp/certificates.h>
 
+class Cinema;
+
+namespace cxml {
+	class Node;
+}
+
 class Screen
 {
 public:
@@ -7,20 +33,37 @@ public:
 		: name (n)
 		, certificate (cert)
 	{}
+
+	Screen (boost::shared_ptr<const cxml::Node>);
+
+	void as_xml (xmlpp::Element *) const;
 	
+	boost::shared_ptr<Cinema> cinema;
 	std::string name;
 	boost::shared_ptr<libdcp::Certificate> certificate;
 };
 
-class Cinema
+class Cinema : public boost::enable_shared_from_this<Cinema>
 {
 public:
 	Cinema (std::string const & n, std::string const & e)
 		: name (n)
 		, email (e)
 	{}
+
+	Cinema (boost::shared_ptr<const cxml::Node>);
+
+	void as_xml (xmlpp::Element *) const;
+
+	void add_screen (boost::shared_ptr<Screen>);
+	void remove_screen (boost::shared_ptr<Screen>);
 	
 	std::string name;
 	std::string email;
-	std::list<boost::shared_ptr<Screen> > screens;
+	std::list<boost::shared_ptr<Screen> > screens () const {
+		return _screens;
+	}
+
+private:	
+	std::list<boost::shared_ptr<Screen> > _screens;
 };