Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 8421f468751f72548560c9705f27cefa9bb8fcaa..3bf958d82b451d5f49e0183730c5ef2a22d864dd 100644 (file)
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -18,37 +18,17 @@
 */
 
 /** @file  src/lib/cinema.h
- *  @brief Screen and Cinema classes.
+ *  @brief Cinema class.
  */
 
-#include <boost/enable_shared_from_this.hpp>
-#include <dcp/certificates.h>
 #include <libcxml/cxml.h>
+#include <boost/enable_shared_from_this.hpp>
 
-class Cinema;
-
-/** @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::optional<dcp::Certificate> cert)
-               : name (n)
-               , certificate (cert)
-       {}
-
-       Screen (cxml::ConstNodePtr);
+namespace xmlpp {
+       class Element;
+}
 
-       void as_xml (xmlpp::Element *) const;
-       
-       boost::shared_ptr<Cinema> cinema;
-       std::string name;
-       boost::optional<dcp::Certificate> certificate;
-};
+class Screen;
 
 /** @class Cinema
  *  @brief A description of a Cinema for KDM generation.
@@ -72,13 +52,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;
 };