diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-03-02 23:10:55 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-03-08 10:31:03 +0000 |
| commit | bdae32bb84672026c1a373e809804109e95accf4 (patch) | |
| tree | 2bc51cc43f10a87503661a4829d1d34dbaf7549a /src/tools | |
| parent | 581ea73e56388d87a0c7f736efce447076618393 (diff) | |
Take notice of cinema time zones when making KDMs (#788).
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_kdm.cc | 7 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 643aaeb77..b98ec84a9 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -38,6 +38,7 @@ #include "lib/cinema_kdms.h" #include "lib/send_kdm_email_job.h" #include "lib/compose.hpp" +#include "lib/cinema.h" #include <dcp/encrypted_kdm.h> #include <dcp/decrypted_kdm.h> #include <dcp/exceptions.h> @@ -270,7 +271,11 @@ private: /* Make an empty KDM */ dcp::DecryptedKDM kdm ( - _timing->from(), _timing->until(), decrypted.annotation_text(), decrypted.content_title_text(), dcp::LocalTime().as_string() + dcp::LocalTime (_timing->from(), i->cinema->utc_offset(), 0), + dcp::LocalTime (_timing->until(), i->cinema->utc_offset(), 0), + decrypted.annotation_text(), + decrypted.content_title_text(), + dcp::LocalTime().as_string() ); /* Add keys from the DKDM */ diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 2f8212a61..2a6ce9e12 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -46,8 +46,8 @@ help () cerr << "Syntax: " << program_name << " [OPTION] [<FILM>]\n" " -h, --help show this help\n" " -o, --output output file or directory\n" - " -f, --valid-from valid from time (in local time zone) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n" - " -t, --valid-to valid to time (in local time zone) (e.g. \"2014-09-28 01:41:51\")\n" + " -f, --valid-from valid from time (in local time zone of the cinema) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n" + " -t, --valid-to valid to time (in local time zone of the cinema) (e.g. \"2014-09-28 01:41:51\")\n" " -d, --valid-duration valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n" " --formulation modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n" " -z, --zip ZIP each cinema's KDMs into its own file\n" @@ -283,7 +283,7 @@ int main (int argc, char* argv[]) try { list<ScreenKDM> screen_kdms = film->make_kdms ( - (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation + (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation ); if (zip) { |