X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcinema.h;h=fea4f1c149362ebbc944a8dc1bb547ccb9943b0c;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=74357f65d687e0261ded537e94b3b4f95afcfdb2;hpb=04533b9cf34ce8089113015715083ee9c5b2b001;p=dcpomatic.git

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 74357f65d..fea4f1c14 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -21,9 +21,9 @@
  *  @brief Screen and Cinema classes.
  */
 
-#include <boost/enable_shared_from_this.hpp>
-#include <dcp/certificates.h>
 #include <libcxml/cxml.h>
+#include <dcp/certificates.h>
+#include <boost/enable_shared_from_this.hpp>
 
 class Cinema;
 
@@ -36,7 +36,7 @@ class Cinema;
 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)
 	{}
@@ -44,10 +44,10 @@ public:
 	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
@@ -72,13 +72,13 @@ public:
 
 	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;
 };