Move UTC offset for KDMs from the cinema to the point of KDM creation (#2300).

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

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 3cb17502bed46eed17d1b118ef68b81328962540..f8f52dc162160624d8f3b48325886a8cbfa64dd5 100644 (file)
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -22,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.
@@ -37,53 +41,32 @@ 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::list<std::string> const & e, std::string notes_)
                : 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);
 
        void as_xml (xmlpp::Element *) const;
 
-       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);
+       void add_screen (std::shared_ptr<dcpomatic::Screen>);
+       void remove_screen (std::shared_ptr<dcpomatic::Screen>);
 
        std::string name;
        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 {
+       std::list<std::shared_ptr<dcpomatic::Screen>> screens () const {
                return _screens;
        }
 
 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;
+       std::list<std::shared_ptr<dcpomatic::Screen>> _screens;
 };