Cleanups.

4 files changed, 24 insertions, 4 deletions

diff --git a/src/lib/dkdm_recipient.h b/src/lib/dkdm_recipient.h
index 77ef4e2e5..3c07020cc 100644
--- a/src/lib/dkdm_recipient.h
+++ b/src/lib/dkdm_recipient.h
@@ -45,9 +45,6 @@ public:
 
 	void as_xml (xmlpp::Element *) const;
 
-	void set_utc_offset_hour (int h);
-	void set_utc_offset_minute (int m);
-
 	int utc_offset_hour () const {
 		return _utc_offset_hour;
 	}
@@ -56,6 +53,9 @@ public:
 		return _utc_offset_minute;
 	}
 
+	void set_utc_offset_hour (int h);
+	void set_utc_offset_minute (int m);
+
 	std::list<std::string> emails;
 
 private:
diff --git a/src/lib/kdm_recipient.h b/src/lib/kdm_recipient.h
index c0533daeb..6658b351b 100644
--- a/src/lib/kdm_recipient.h
+++ b/src/lib/kdm_recipient.h
@@ -39,6 +39,8 @@ public:
 	explicit KDMRecipient (cxml::ConstNodePtr);
 
 	virtual void as_xml (xmlpp::Element *) const;
+	virtual int utc_offset_hour () const = 0;
+	virtual int utc_offset_minute () const = 0;
 
 	std::string name;
 	std::string notes;
diff --git a/src/lib/screen.cc b/src/lib/screen.cc
index ea23ba39a..97e200ec7 100644
--- a/src/lib/screen.cc
+++ b/src/lib/screen.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,6 +19,7 @@
 */
 
 #include "screen.h"
+#include "cinema.h"
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
@@ -58,3 +59,17 @@ Screen::trusted_device_thumbprints () const
 	return t;
 }
 
+
+int
+Screen::utc_offset_hour () const
+{
+	return cinema ? cinema->utc_offset_hour() : 0;
+}
+
+
+int
+Screen::utc_offset_minute () const
+{
+	return cinema ? cinema->utc_offset_minute() : 0;
+}
+
diff --git a/src/lib/screen.h b/src/lib/screen.h
index 8eb7b4161..39d8f627e 100644
--- a/src/lib/screen.h
+++ b/src/lib/screen.h
@@ -50,6 +50,9 @@ public:
 	explicit Screen (cxml::ConstNodePtr);
 
 	void as_xml (xmlpp::Element *) const;
+	int utc_offset_hour () const;
+	int utc_offset_minute () const;
+
 	std::vector<std::string> trusted_device_thumbprints () const;
 
 	boost::shared_ptr<Cinema> cinema;