Add UTC-3:30 timezone to cinema (#831).

3 files changed, 40 insertions, 13 deletions

diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 5e2b1b533..e9a7dce68 100644
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -32,11 +32,18 @@ using boost::shared_ptr;
 
 Cinema::Cinema (cxml::ConstNodePtr node)
 	: name (node->string_child ("Name"))
-	, _utc_offset (node->optional_number_child<int>("UTCOffset").get_value_or (0))
 {
 	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
@@ -60,7 +67,8 @@ Cinema::as_xml (xmlpp::Element* parent) const
 		parent->add_child("Email")->add_child_text (i);
 	}
 
-	parent->add_child("UTCOffset")->add_child_text (dcp::raw_convert<string> (_utc_offset));
+	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"));
@@ -81,8 +89,15 @@ Cinema::remove_screen (shared_ptr<Screen> s)
 }
 
 void
-Cinema::set_utc_offset (int o)
+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 (o >= -11 && o <= 12);
-	_utc_offset = o;
+	DCPOMATIC_ASSERT (m >= 0 && m <= 59);
+	_utc_offset_minute = m;
 }
diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 7df83c767..70508f233 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -39,10 +39,11 @@ class Screen;
 class Cinema : public boost::enable_shared_from_this<Cinema>
 {
 public:
-	Cinema (std::string const & n, std::list<std::string> const & e, int utc_offset)
+	Cinema (std::string const & n, std::list<std::string> const & e, int utc_offset_hour, int utc_offset_minute)
 		: name (n)
 		, emails (e)
-		, _utc_offset (utc_offset)
+		, _utc_offset_hour (utc_offset_hour)
+		, _utc_offset_minute (utc_offset_minute)
 	{}
 
 	Cinema (cxml::ConstNodePtr);
@@ -54,13 +55,20 @@ public:
 	void add_screen (boost::shared_ptr<Screen>);
 	void remove_screen (boost::shared_ptr<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;
+
+	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 {
 		return _screens;
 	}
@@ -70,5 +78,9 @@ private:
 	/** 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;
 };
diff --git a/src/lib/film.cc b/src/lib/film.cc
index e669ea4ae..1775f7c7f 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1208,8 +1208,8 @@ Film::make_kdms (
 				i->recipient.get(),
 				i->trusted_devices,
 				dcp,
-				dcp::LocalTime (from, i->cinema->utc_offset(), 0),
-				dcp::LocalTime (until, i->cinema->utc_offset(), 0),
+				dcp::LocalTime (from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+				dcp::LocalTime (until, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
 				formulation
 				);