Merge master.

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

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 251bb5d6131e3869d12f7cecfb5b92358a2d1db2..2e7660860e66777d015c58246c33758df65e0f91 100644 (file)
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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
@@ -17,8 +17,12 @@
 
 */
 
+/** @file  src/lib/cinema.h
+ *  @brief Screen and Cinema classes.
+ */
+
 #include <boost/enable_shared_from_this.hpp>
-#include <libdcp/certificates.h>
+#include <dcp/certificates.h>
 
 class Cinema;
 
@@ -26,10 +30,16 @@ namespace cxml {
        class Node;
 }
 
+/** @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<libdcp::Certificate> cert)
+       Screen (std::string const & n, boost::shared_ptr<dcp::Certificate> cert)
                : name (n)
                , certificate (cert)
        {}
@@ -40,9 +50,15 @@ public:
        
        boost::shared_ptr<Cinema> cinema;
        std::string name;
-       boost::shared_ptr<libdcp::Certificate> certificate;
+       boost::shared_ptr<dcp::Certificate> certificate;
 };
 
+/** @class Cinema
+ *  @brief A description of a Cinema for KDM generation.
+ *
+ *  This is a cinema name, contact email address and a list of
+ *  Screen objects.
+ */
 class Cinema : public boost::enable_shared_from_this<Cinema>
 {
 public:
@@ -53,6 +69,8 @@ public:
 
        Cinema (boost::shared_ptr<const cxml::Node>);
 
+       void read_screens (boost::shared_ptr<const cxml::Node>);
+
        void as_xml (xmlpp::Element *) const;
 
        void add_screen (boost::shared_ptr<Screen>);