X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema.h;h=6a3d89845dbc11b747a694338ab34e5f6688b6a5;hp=74357f65d687e0261ded537e94b3b4f95afcfdb2;hb=f0c10e92b849566e458bc323f8783a6fe83e52d2;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 74357f65d..6a3d89845 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -1,70 +1,54 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 /** @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::shared_ptr<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::shared_ptr<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)
-		: name (n)
-		, email (e)
+	Cinema (std::string const & name_, std::list<std::string> const & e, std::string notes_, int utc_offset_hour, int utc_offset_minute)
+		: name (name_)
+		, emails (e)
+		, notes (notes_)
+		, _utc_offset_hour (utc_offset_hour)
+		, _utc_offset_minute (utc_offset_minute)
 	{}
 
-	Cinema (cxml::ConstNodePtr);
+	explicit Cinema (cxml::ConstNodePtr);
 
 	void read_screens (cxml::ConstNodePtr);
 
@@ -72,13 +56,34 @@ 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;
+	std::string notes;
+
+	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;
 };