Restore time zone to Cinema and improve UI to use it (#2473).

3 files changed, 5 insertions, 7 deletions

diff --git a/test/config_test.cc b/test/config_test.cc
index 00adb7b09..d50c3d6f3 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -246,7 +246,7 @@ BOOST_AUTO_TEST_CASE (config_keep_cinemas_if_making_new_config)
 
 	Config::instance()->write();
 
-	Config::instance()->add_cinema(make_shared<Cinema>("My Great Cinema", vector<string>(), ""));
+	Config::instance()->add_cinema(make_shared<Cinema>("My Great Cinema", vector<string>(), "", dcp::UTCOffset()));
 	Config::instance()->write();
 
 	boost::filesystem::copy_file (dir / "cinemas.xml", dir / "backup_for_test.xml");
diff --git a/test/kdm_cli_test.cc b/test/kdm_cli_test.cc
index 2a508d97c..1c590cdf7 100644
--- a/test/kdm_cli_test.cc
+++ b/test/kdm_cli_test.cc
@@ -154,13 +154,13 @@ setup_test_config()
 	auto config = Config::instance();
 	auto const cert = dcp::Certificate(dcp::file_to_string("test/data/cert.pem"));
 
-	auto cinema_a = std::make_shared<Cinema>("Dean's Screens", vector<string>(), "");
+	auto cinema_a = std::make_shared<Cinema>("Dean's Screens", vector<string>(), "", dcp::UTCOffset());
 	cinema_a->add_screen(std::make_shared<dcpomatic::Screen>("Screen 1", "", cert, boost::none, std::vector<TrustedDevice>()));
 	cinema_a->add_screen(std::make_shared<dcpomatic::Screen>("Screen 2", "", cert, boost::none, std::vector<TrustedDevice>()));
 	cinema_a->add_screen(std::make_shared<dcpomatic::Screen>("Screen 3", "", cert, boost::none, std::vector<TrustedDevice>()));
 	config->add_cinema(cinema_a);
 
-	auto cinema_b = std::make_shared<Cinema>("Floyd's Celluloid", vector<string>(), "");
+	auto cinema_b = std::make_shared<Cinema>("Floyd's Celluloid", vector<string>(), "", dcp::UTCOffset());
 	cinema_b->add_screen(std::make_shared<dcpomatic::Screen>("Foo", "", cert, boost::none, std::vector<TrustedDevice>()));
 	cinema_b->add_screen(std::make_shared<dcpomatic::Screen>("Bar", "", cert, boost::none, std::vector<TrustedDevice>()));
 	config->add_cinema(cinema_b);
diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index 0f44fe2ea..f73e4295e 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -59,14 +59,14 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 
 	auto crypt_cert = c->decryption_chain()->leaf();
 
-	auto cinema_a = make_shared<Cinema>("Cinema A", vector<string>(), "");
+	auto cinema_a = make_shared<Cinema>("Cinema A", vector<string>(), "", dcp::UTCOffset{4, 30});
 	cinema_a_screen_1 = std::make_shared<dcpomatic::Screen>("Screen 1", "", crypt_cert, boost::none, vector<TrustedDevice>());
 	cinema_a->add_screen (cinema_a_screen_1);
 	cinema_a_screen_2 = std::make_shared<dcpomatic::Screen>("Screen 2", "", crypt_cert, boost::none, vector<TrustedDevice>());
 	cinema_a->add_screen (cinema_a_screen_2);
 	c->add_cinema (cinema_a);
 
-	auto cinema_b = make_shared<Cinema>("Cinema B", vector<string>(), "");
+	auto cinema_b = make_shared<Cinema>("Cinema B", vector<string>(), "", dcp::UTCOffset{-1, 0});
 	cinema_b_screen_x = std::make_shared<dcpomatic::Screen>("Screen X", "", crypt_cert, boost::none, vector<TrustedDevice>());
 	cinema_b->add_screen (cinema_b_screen_x);
 	cinema_b_screen_y = std::make_shared<dcpomatic::Screen>("Screen Y", "", crypt_cert, boost::none, vector<TrustedDevice>());
@@ -89,10 +89,8 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 	auto sign_cert = c->signer_chain()->leaf();
 
 	dcp::LocalTime from = sign_cert.not_before();
-	from.set_offset({ 4, 30 });
 	from.add_months (2);
 	dcp::LocalTime until = sign_cert.not_after();
-	until.set_offset({ 4, 30 });
 	until.add_months (-2);
 
 	std::vector<KDMCertificatePeriod> period_checks;