X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema.h;h=c17454db980f957aff708857ed4d4bcab76f85bd;hp=db0c7fac79a075142c7b9103b22af1b750e9a58b;hb=HEAD;hpb=068291b7233b01573863d7fb5eda2a82883c748d

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index db0c7fac7..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,10 +41,10 @@ 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 & name_, std::list<std::string> const & e, std::string notes_, int utc_offset_hour, int utc_offset_minute)
+	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)
 		, notes (notes_)
@@ -47,20 +52,20 @@ public:
 		, _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_hour (int h);
 	void set_utc_offset_minute (int m);
 
 	std::string name;
-	std::list<std::string> emails;
+	std::vector<std::string> emails;
 	std::string notes;
 
 	int utc_offset_hour () const {
@@ -71,12 +76,12 @@ public:
 		return _utc_offset_minute;
 	}
 
-	std::list<boost::shared_ptr<Screen> > screens () const {
+	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.
 	*/