X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcinema.h;h=fea4f1c149362ebbc944a8dc1bb547ccb9943b0c;hb=a0614e6e3b566827381121fdb4ee73268281a70d;hp=2e7660860e66777d015c58246c33758df65e0f91;hpb=1dcfb3a26085ebb3703f40e2f51e43ce3d98be50;p=dcpomatic.git

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 2e7660860..fea4f1c14 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -21,15 +21,12 @@
  *  @brief Screen and Cinema classes.
  */
 
-#include <boost/enable_shared_from_this.hpp>
+#include <libcxml/cxml.h>
 #include <dcp/certificates.h>
+#include <boost/enable_shared_from_this.hpp>
 
 class Cinema;
 
-namespace cxml {
-	class Node;
-}
-
 /** @class Screen
  *  @brief A representation of a Screen for KDM generation.
  *
@@ -39,18 +36,18 @@ namespace cxml {
 class Screen
 {
 public:
-	Screen (std::string const & n, boost::shared_ptr<dcp::Certificate> cert)
+	Screen (std::string const & n, boost::optional<dcp::Certificate> cert)
 		: name (n)
 		, certificate (cert)
 	{}
 
-	Screen (boost::shared_ptr<const cxml::Node>);
+	Screen (cxml::ConstNodePtr);
 
 	void as_xml (xmlpp::Element *) const;
-	
+
 	boost::shared_ptr<Cinema> cinema;
 	std::string name;
-	boost::shared_ptr<dcp::Certificate> certificate;
+	boost::optional<dcp::Certificate> certificate;
 };
 
 /** @class Cinema
@@ -67,21 +64,21 @@ public:
 		, email (e)
 	{}
 
-	Cinema (boost::shared_ptr<const cxml::Node>);
+	Cinema (cxml::ConstNodePtr);
 
-	void read_screens (boost::shared_ptr<const cxml::Node>);
+	void read_screens (cxml::ConstNodePtr);
 
 	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 () const {
 		return _screens;
 	}
 
-private:	
+private:
 	std::list<boost::shared_ptr<Screen> > _screens;
 };