X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema.h;h=70508f23321d4a233e7bed4ffc8d62ef095d2eff;hp=8421f468751f72548560c9705f27cefa9bb8fcaa;hb=c74d789ed75e87bccd094f45f082674f8f8d2f2f;hpb=f4030653da8f5a0b3daebe640f485b3daf9ef091

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 8421f4687..70508f233 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 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
@@ -18,50 +18,32 @@
 */
 
 /** @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.
  *
- *  This is a cinema name, contact email address and a list of
+ *  This is a cinema name, some metadata and a list of
  *  Screen objects.
  */
 class Cinema : public boost::enable_shared_from_this<Cinema>
 {
 public:
-	Cinema (std::string const & n, std::string const & e)
+	Cinema (std::string const & n, std::list<std::string> const & e, int utc_offset_hour, int utc_offset_minute)
 		: name (n)
-		, email (e)
+		, emails (e)
+		, _utc_offset_hour (utc_offset_hour)
+		, _utc_offset_minute (utc_offset_minute)
 	{}
 
 	Cinema (cxml::ConstNodePtr);
@@ -72,13 +54,33 @@ public:
 
 	void add_screen (boost::shared_ptr<Screen>);
 	void remove_screen (boost::shared_ptr<Screen>);
-	
+
+	void set_utc_offset_hour (int h);
+	void set_utc_offset_minute (int m);
+
 	std::string name;
-	std::string email;
+	std::list<std::string> emails;
+
+	int utc_offset_hour () const {
+		return _utc_offset_hour;
+	}
+
+	int utc_offset_minute () const {
+		return _utc_offset_minute;
+	}
+
 	std::list<boost::shared_ptr<Screen> > screens () const {
 		return _screens;
 	}
 
-private:	
+private:
 	std::list<boost::shared_ptr<Screen> > _screens;
+	/** Offset such that the equivalent time in UTC can be determined
+	    by subtracting the offset from the local time.
+	*/
+	int _utc_offset_hour;
+	/** Additional minutes to add to _utc_offset_hour if _utc_offset_hour is
+	    positive, or to subtract if _utc_offset_hour is negative.
+	*/
+	int _utc_offset_minute;
 };