X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcinema.h;h=3bf958d82b451d5f49e0183730c5ef2a22d864dd;hb=5b3e3df6c9352e31dd932a5af215eabbf2cf27c8;hp=2e7660860e66777d015c58246c33758df65e0f91;hpb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da;p=dcpomatic.git

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 2e7660860..3bf958d82 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -18,40 +18,17 @@
 */
 
 /** @file  src/lib/cinema.h
- *  @brief Screen and Cinema classes.
+ *  @brief Cinema class.
  */
 
+#include <libcxml/cxml.h>
 #include <boost/enable_shared_from_this.hpp>
-#include <dcp/certificates.h>
 
-class Cinema;
-
-namespace cxml {
-	class Node;
+namespace xmlpp {
+	class Element;
 }
 
-/** @class Screen
- *  @brief A representation of a Screen for KDM generation.
- *
- *  This is the name of the screen and the certificate of its
- *  server.
- */
-class Screen
-{
-public:
-	Screen (std::string const & n, boost::shared_ptr<dcp::Certificate> cert)
-		: 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<dcp::Certificate> certificate;
-};
+class Screen;
 
 /** @class Cinema
  *  @brief A description of a Cinema for KDM generation.
@@ -67,21 +44,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;
 };