X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema.h;h=6c202a7bfc0e03515925d67162b90ee5c295995f;hp=7df83c7678f2c4c40ef9751707d20908917a6966;hb=9f125fddff88bf62d36381f9d3f09e5240b033d5;hpb=0f3c2864599f9e5a5ec001266b4aefb0205d1e1f

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 7df83c767..6c202a7bf 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -21,14 +22,18 @@
  *  @brief Cinema class.
  */
 
+
 #include <libcxml/cxml.h>
-#include <boost/enable_shared_from_this.hpp>
+#include <memory>
+
 
 namespace xmlpp {
 	class Element;
 }
 
-class Screen;
+namespace dcpomatic {
+	class Screen;
+}
 
 /** @class Cinema
  *  @brief A description of a Cinema for KDM generation.
@@ -36,39 +41,53 @@ class Screen;
  *  This is a cinema name, some metadata and a list of
  *  Screen objects.
  */
-class Cinema : public boost::enable_shared_from_this<Cinema>
+class Cinema : public std::enable_shared_from_this<Cinema>
 {
 public:
-	Cinema (std::string const & n, std::list<std::string> const & e, int utc_offset)
-		: name (n)
+	Cinema(std::string const & name_, std::vector<std::string> const & e, std::string notes_, int utc_offset_hour, int utc_offset_minute)
+		: name (name_)
 		, emails (e)
-		, _utc_offset (utc_offset)
+		, 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);
 
 	void as_xml (xmlpp::Element *) const;
 
-	void add_screen (boost::shared_ptr<Screen>);
-	void remove_screen (boost::shared_ptr<Screen>);
+	void add_screen (std::shared_ptr<dcpomatic::Screen>);
+	void remove_screen (std::shared_ptr<dcpomatic::Screen>);
 
-	void set_utc_offset (int o);
+	void set_utc_offset_hour (int h);
+	void set_utc_offset_minute (int m);
 
 	std::string name;
-	std::list<std::string> emails;
-	int utc_offset () const {
-		return _utc_offset;
+	std::vector<std::string> emails;
+	std::string notes;
+
+	int utc_offset_hour () const {
+		return _utc_offset_hour;
 	}
-	std::list<boost::shared_ptr<Screen> > screens () const {
+
+	int utc_offset_minute () const {
+		return _utc_offset_minute;
+	}
+
+	std::vector<std::shared_ptr<dcpomatic::Screen>> screens() const {
 		return _screens;
 	}
 
 private:
-	std::list<boost::shared_ptr<Screen> > _screens;
+	std::vector<std::shared_ptr<dcpomatic::Screen>> _screens;
 	/** Offset such that the equivalent time in UTC can be determined
 	    by subtracting the offset from the local time.
 	*/
-	int _utc_offset;
+	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;
 };