d588620e70bf15da29cc242e4ae8d86977e8f36a from master; fix hang if you cancel a paused...

[dcpomatic.git] / src / lib / cinema.h

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 74357f65d687e0261ded537e94b3b4f95afcfdb2..5c0386837098f1fd668749a57cafeee078ced081 100644 (file)
--- 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)
        {}
@@ -47,7 +47,7 @@ public:
        
        boost::shared_ptr<Cinema> cinema;
        std::string name;
-       boost::shared_ptr<dcp::Certificate> certificate;
+       boost::optional<dcp::Certificate> certificate;
 };
 
 /** @class Cinema