Fix crash on emitting a signal during a constructor.

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

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index ebd7160098df67d6657016427e09ca6037b47451..6e651dc764d467d64f98424cb1ff5cb19301ffed 100644 (file)
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 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
@@ -19,9 +19,12 @@
 
 #include "cinema.h"
 #include "screen.h"
+#include "dcpomatic_assert.h"
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 using std::list;
 using std::string;
@@ -29,10 +32,19 @@ using boost::shared_ptr;
 
 Cinema::Cinema (cxml::ConstNodePtr node)
        : name (node->string_child ("Name"))
+       , notes (node->optional_string_child("Notes").get_value_or(""))
 {
        BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Email")) {
                emails.push_back (i->content ());
        }
+
+       if (node->optional_number_child<int>("UTCOffset")) {
+               _utc_offset_hour = node->number_child<int>("UTCOffset");
+       } else {
+               _utc_offset_hour = node->optional_number_child<int>("UTCOffsetHour").get_value_or (0);
+       }
+
+       _utc_offset_minute = node->optional_number_child<int>("UTCOffsetMinute").get_value_or (0);
 }
 
 /* This is necessary so that we can use shared_from_this in add_screen (which cannot be done from
@@ -56,6 +68,11 @@ Cinema::as_xml (xmlpp::Element* parent) const
                parent->add_child("Email")->add_child_text (i);
        }
 
+       parent->add_child("Notes")->add_child_text (notes);
+
+       parent->add_child("UTCOffsetHour")->add_child_text (dcp::raw_convert<string> (_utc_offset_hour));
+       parent->add_child("UTCOffsetMinute")->add_child_text (dcp::raw_convert<string> (_utc_offset_minute));
+
        BOOST_FOREACH (shared_ptr<Screen> i, _screens) {
                i->as_xml (parent->add_child ("Screen"));
        }
@@ -73,3 +90,17 @@ Cinema::remove_screen (shared_ptr<Screen> s)
 {
        _screens.remove (s);
 }
+
+void
+Cinema::set_utc_offset_hour (int h)
+{
+       DCPOMATIC_ASSERT (h >= -11 && h <= 12);
+       _utc_offset_hour = h;
+}
+
+void
+Cinema::set_utc_offset_minute (int m)
+{
+       DCPOMATIC_ASSERT (m >= 0 && m <= 59);
+       _utc_offset_minute = m;
+}