X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcinema.cc;h=936517a4039b100630b3ddf1020efe719d57f3c2;hp=ce3077b2a041df9ab21e6600a59f4f770f78f164;hb=e46302d86c7295bd95cd7cdfa331c8186fe793cb;hpb=bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index ce3077b2a..936517a40 100644
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -1,34 +1,55 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 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/>.
 
 */
 
+
 #include "cinema.h"
+#include "screen.h"
+#include "dcpomatic_assert.h"
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 
+
 using std::list;
-using boost::shared_ptr;
+using std::string;
+using std::shared_ptr;
+using std::make_shared;
+using dcp::raw_convert;
+using dcpomatic::Screen;
+
 
 Cinema::Cinema (cxml::ConstNodePtr node)
 	: name (node->string_child ("Name"))
-	, email (node->string_child ("Email"))
+	, notes (node->optional_string_child("Notes").get_value_or(""))
 {
+	for (auto 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
@@ -37,9 +58,8 @@ Cinema::Cinema (cxml::ConstNodePtr node)
 void
 Cinema::read_screens (cxml::ConstNodePtr node)
 {
-	list<cxml::NodePtr> s = node->node_children ("Screen");
-	for (list<cxml::NodePtr>::iterator i = s.begin(); i != s.end(); ++i) {
-		add_screen (shared_ptr<Screen> (new Screen (*i)));
+	for (auto i: node->node_children("Screen")) {
+		add_screen (make_shared<Screen>(i));
 	}
 }
 
@@ -47,10 +67,18 @@ void
 Cinema::as_xml (xmlpp::Element* parent) const
 {
 	parent->add_child("Name")->add_child_text (name);
-	parent->add_child("Email")->add_child_text (email);
 
-	for (list<shared_ptr<Screen> >::const_iterator i = _screens.begin(); i != _screens.end(); ++i) {
-		(*i)->as_xml (parent->add_child ("Screen"));
+	for (auto i: emails) {
+		parent->add_child("Email")->add_child_text (i);
+	}
+
+	parent->add_child("Notes")->add_child_text (notes);
+
+	parent->add_child("UTCOffsetHour")->add_child_text (raw_convert<string> (_utc_offset_hour));
+	parent->add_child("UTCOffsetMinute")->add_child_text (raw_convert<string> (_utc_offset_minute));
+
+	for (auto i: _screens) {
+		i->as_xml (parent->add_child ("Screen"));
 	}
 }
 
@@ -67,21 +95,16 @@ Cinema::remove_screen (shared_ptr<Screen> s)
 	_screens.remove (s);
 }
 
-Screen::Screen (cxml::ConstNodePtr node)
-	: name (node->string_child ("Name"))
+void
+Cinema::set_utc_offset_hour (int h)
 {
-	if (node->optional_string_child ("Certificate")) {
-		certificate = dcp::Certificate (node->string_child ("Certificate"));
-	}
+	DCPOMATIC_ASSERT (h >= -11 && h <= 12);
+	_utc_offset_hour = h;
 }
 
 void
-Screen::as_xml (xmlpp::Element* parent) const
+Cinema::set_utc_offset_minute (int m)
 {
-	parent->add_child("Name")->add_child_text (name);
-	if (certificate) {
-		parent->add_child("Certificate")->add_child_text (certificate->certificate (true));
-	}
+	DCPOMATIC_ASSERT (m >= 0 && m <= 59);
+	_utc_offset_minute = m;
 }
-
-