Cleanups.

6 files changed, 35 insertions, 17 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;
diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index e8bf02b4a..9ced2d4bf 100644
--- a/src/tools/dcpomatic_kdm_cli.cc
+++ b/src/tools/dcpomatic_kdm_cli.cc
@@ -23,18 +23,19 @@
  */
 
 #include "lib/film.h"
-#include "lib/cinema.h"
 #include "lib/screen_with_kdm.h"
-#include "lib/cinema_kdms.h"
 #include "lib/config.h"
 #include "lib/exceptions.h"
 #include "lib/emailer.h"
 #include "lib/dkdm_wrapper.h"
 #include "lib/screen.h"
+#include "lib/cinema.h"
+#include "lib/cinema_kdms.h"
 #include <dcp/certificate.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/encrypted_kdm.h>
 #include <getopt.h>
+#include <boost/foreach.hpp>
 #include <iostream>
 
 using std::string;
@@ -237,8 +238,8 @@ from_film (
 						i->recipient.get(),
 						i->trusted_device_thumbprints(),
 						cpl,
-						dcp::LocalTime(valid_from, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
-						dcp::LocalTime(valid_to,   i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
+						dcp::LocalTime(valid_from, i->utc_offset_hour(), i->utc_offset_minute()),
+						dcp::LocalTime(valid_to,   i->utc_offset_hour(), i->utc_offset_minute()),
 						formulation,
 						disable_forensic_marking_picture,
 						disable_forensic_marking_audio
@@ -359,8 +360,8 @@ from_dkdm (
 							dkdm,
 							i->recipient.get(),
 							i->trusted_device_thumbprints(),
-							dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-							dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+							dcp::LocalTime(valid_from, i->utc_offset_hour(), i->utc_offset_minute()),
+							dcp::LocalTime(valid_to, i->utc_offset_hour(), i->utc_offset_minute()),
 							formulation,
 							disable_forensic_marking_picture,
 							disable_forensic_marking_audio
@@ -546,9 +547,8 @@ int main (int argc, char* argv[])
 	}
 
 	if (list_cinemas) {
-		list<boost::shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
-		for (list<boost::shared_ptr<Cinema> >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
-			cout << (*i)->name << " (" << Emailer::address_list ((*i)->emails) << ")\n";
+		BOOST_FOREACH(shared_ptr<Cinema> i, Config::instance()->cinemas()) {
+			cout << i->name << " (" << Emailer::address_list(i->emails) << ")\n";
 		}
 		exit (EXIT_SUCCESS);
 	}
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index b1239ac78..843cbfb1d 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -31,9 +31,7 @@
 #include "lib/screen.h"
 #include "lib/screen_with_kdm.h"
 #include "lib/job_manager.h"
-#include "lib/cinema_kdms.h"
 #include "lib/config.h"
-#include "lib/cinema.h"
 #include <libcxml/cxml.h>
 #include <dcp/exceptions.h>
 #include <wx/treectrl.h>
@@ -168,8 +166,8 @@ KDMDialog::make_clicked ()
 						i->recipient.get(),
 						i->trusted_device_thumbprints(),
 						_cpl->cpl(),
-						dcp::LocalTime(_timing->from(),  i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
-						dcp::LocalTime(_timing->until(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0),
+						dcp::LocalTime(_timing->from(),  i->utc_offset_hour(), i->utc_offset_minute()),
+						dcp::LocalTime(_timing->until(), i->utc_offset_hour(), i->utc_offset_minute()),
 						_output->formulation(),
 						!_output->forensic_mark_video(),
 						for_audio